[Monotone-commits-nodiffs] Revision 47c5bf1a1a7ccdbab2f1dcc4ad702e4d148e75ba

[monotone]

-----------------------------------------------------------------
Revision: 47c5bf1a1a7ccdbab2f1dcc4ad702e4d148e75ba
Ancestor: 6430347efb3282e0ee87533709d9501a91d6cd73
Author: address@hidden
Date: 2005-06-05T02:27:13
Branch: net.venge.monotone

Modified files:
        ChangeLog commands.cc tests/t_update_with_pending_add.at
        tests/t_update_with_pending_drop.at
        tests/t_update_with_pending_rename.at

ChangeLog: 

2005-06-04  Derek Scherger  <address@hidden>

        * commands.cc (update): update MT/work based on the changes
        between the chosen revision and the new merge revision
        * tests/t_update_with_pending_drop.at: 
        * tests/t_update_with_pending_add.at: 
        * tests/t_update_with_pending_rename.at: un-XFAIL and clean up now
        that things work


monotone --db={your.database} diff 
--revision=6430347efb3282e0ee87533709d9501a91d6cd73 
--revision=47c5bf1a1a7ccdbab2f1dcc4ad702e4d148e75ba
----------------------------------------------------------------------