-----------------------------------------------------------------
Revision: a6c4db99ab5c9b9780bff0b225eb3279a284ce83
Ancestor: 5e003e575dcacb508da3aa11d04cf2825b85e0b2
Author: [email protected]
Date: 2009-08-06T16:32:14
Branch: net.venge.monotone.experiment.remove_leftover_files
Modified files:
tests/move_conflicting_unversioned/__driver__.lua work.cc
ChangeLog:
update move_conflicting_unversioned tests
* tests/move_conflicting_unversioned/__driver__.lua: add comments, use case 2
(passing)
* work.cc (simulated_working_tree::commit): change error on conflicts to
warning. Need to check what that does to all warning cases.
monotone --db={your.database} diff
--revision=5e003e575dcacb508da3aa11d04cf2825b85e0b2
--revision=a6c4db99ab5c9b9780bff0b225eb3279a284ce83
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
