-----------------------------------------------------------------
Revision: c474760e191060309a96fadaa7865ecf6bed5b8c
Ancestor: 88490b82b12035397273da2d882fb2f428ffc57f
Author: [email protected]
Date: 2009-08-29T11:18:59
Branch: net.venge.monotone
Added files:
tests/resolve_conflicts_all_resolutions/show_first-gui_left
tests/resolve_conflicts_all_resolutions/show_first-gui_right
tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
Modified files:
NEWS cmd_conflicts.cc merge_conflict.cc merge_roster.cc
merge_roster.hh monotone.texi
tests/resolve_conflicts_all_resolutions/__driver__.lua
tests/resolve_conflicts_all_resolutions/conflicts-1
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_all_resolutions/show_first-checkout_left
tests/resolve_conflicts_all_resolutions/show_first-checkout_right
tests/resolve_conflicts_all_resolutions/show_first-thermostat
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_errors/__driver__.lua
ChangeLog:
add 'keep' duplicate name conflict resolution.
* NEWS: note 'keep' resolution
* monotone.texi:
* merge_roster.cc (image):
* merge_roster.hh (resolve_conflicts):
* cmd_conflicts.cc (show_conflicts, set_duplicate_name_conflict): add 'keep'
* merge_conflict.cc (syms): add resolved_keep_left, resolved_keep_right
(put_resolution, read_duplicate_name_conflict)
(resolve_duplicate_name_one_side): add 'keep'
* tests/resolve_conflicts_all_resolutions/__driver__.lua: test 'keep'
* tests/resolve_conflicts_all_resolutions/show_first-gui_left: New file.
* tests/resolve_conflicts_all_resolutions/show_first-gui_right: New file.
* tests/resolve_conflicts_all_resolutions/show_remaining-gui_left: New file.
* tests/resolve_conflicts_errors/__driver__.lua: match improved error message
monotone --db={your.database} diff
--revision=88490b82b12035397273da2d882fb2f428ffc57f
--revision=c474760e191060309a96fadaa7865ecf6bed5b8c
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
