-----------------------------------------------------------------
Revision: 609389f075d544cfe74874cd702a5b3b4722a479
Ancestor: 520b783aa134ff75afcd5658b04967ba50d9b712
Ancestor: c8d5ac1aed3573256d4ea645289ef717f811c9c9
Author: Timothy Brownawell <[email protected]>
Date: 05/16/10 19:39:50
Branch: net.venge.monotone
Added files:
maybe_workspace_updater.cc maybe_workspace_updater.hh
tests/disapproving_a_non_head/__driver__.lua
tests/merge_--update/__driver__.lua
Added directories:
tests/disapproving_a_non_head tests/merge_--update
Modified files:
Makefile.am NEWS cmd_key_cert.cc cmd_merging.cc
cmd_netsync.cc cmd_ws_commit.cc database.cc
database_check.cc options_list.hh
tests/db_check_and_non-serious_errors/__driver__.lua
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_content/merge-1
tests/resolve_conflicts_duplicate_name/merge-1
tests/resolve_conflicts_none/merge-1
tests/resolve_conflicts_propagate/propagate-1
tests/resolve_conflicts_propagate/propagate-2
tests/status/__driver__.lua tests/suspend/__driver__.lua
ChangeLog:
Merge fix for #17878 "too easy to accidentally fork afer merge or disapprove"
monotone --db={your.database} diff
--revision=520b783aa134ff75afcd5658b04967ba50d9b712
--revision=609389f075d544cfe74874cd702a5b3b4722a479
monotone --db={your.database} diff
--revision=c8d5ac1aed3573256d4ea645289ef717f811c9c9
--revision=609389f075d544cfe74874cd702a5b3b4722a479
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
