[Monotone-commits-diffs] Revision d24d729f5d7f2538b8aa925da9b0e51190867da7

[monotone]

-----------------------------------------------------------------
Revision: d24d729f5d7f2538b8aa925da9b0e51190867da7
Ancestor: a6b103869665ea6be1829b37f1bfb256e5344724
Author: address@hidden
Date: 2008-09-14T18:21:42
Branch: net.venge.monotone.experiment.remove_leftover_files

Modified files:
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc monotone.texi
        options_list.hh work.cc work.hh

ChangeLog: 

* options_list.hh, cmd_merging.cc, cmd_ws_commit.cc: new option 
--move-conflicting-paths for workspace-changing commands like update, checkout, 
pluck or pivot_root
* work.{hh,cc}: ...used here to determine if we should move unversioned, but 
blocking paths out of the way into _MTN/conflicts/TIMESTAMP (this now no longer 
happens in simulated_working_tree, but in perform_workspace_update, which seems 
to be cleaner)
* cmd_netsync.cc: note that the above option makes no sense for clone since 
this always requires a non-existant directory as target
* monotone.texi: document the new option

txtSzCz2i3BZY.txt
Description: Diff [a6b103869665ea6be1829b37f1bfb256e5344724] -> [d24d729f5d7f2538b8aa925da9b0e51190867da7]