-----------------------------------------------------------------
Revision: d927e7e63d3181b407ff3440f682aa0e230a6052
Ancestor: fe09b5e71606e2f2078ccfc5e295588d1fdedd72
Author: [email protected]
Date: 2009-08-29T13:50:09
Branch: net.venge.monotone.stephe
Added files:
tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
Added directories:
tests/resolve_conflicts_duplicate_name_directory
Modified files:
NEWS merge_conflict.cc monotone.texi
tests/resolve_conflicts_content/conflicts-2
ChangeLog:
Allow resolving directory duplicate name conflict.
* merge_conflict.cc (resolve_duplicate_name_one_side): check for dropping
a non-empty directory.
(roster_merge_result::resolve_duplicate_name_conflicts): handle a directory.
* monotone.texi (Conflicts): remove documentation of 'keep'; that was not
actually implemented.
* tests/resolve_conflicts_duplicate_name_directory: New test
monotone --db={your.database} diff
--revision=fe09b5e71606e2f2078ccfc5e295588d1fdedd72
--revision=d927e7e63d3181b407ff3440f682aa0e230a6052
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
