[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 18b2d521bbb4671537ebfbaf8d79e2bc099cab
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 18b2d521bbb4671537ebfbaf8d79e2bc099cabbf |
Date: |
Thu, 8 Nov 2007 08:08:15 +0100 |
-----------------------------------------------------------------
Revision: 18b2d521bbb4671537ebfbaf8d79e2bc099cabbf
Ancestor: d83907887a2a35229ef361a74e98bd296d84e60c
Author: address@hidden
Date: 2007-11-08T06:03:27
Branch: net.venge.monotone.cleanup.conflict-messages
Added files:
tests/non_content_conflicts/__driver__.lua
Added directories:
tests/non_content_conflicts
Modified files:
cmd_merging.cc merge.cc roster_merge.cc roster_merge.hh
ChangeLog:
* cmd_merging.cc (show_conflicts): rename node_name_conflicts to
divergent_name_conflicts; rename rename_target_conflicts to
convergent_name_conflicts
* merge.cc (resolve_merge_conflicts):
* roster_merge.{cc,hh} (is_clean): use new conflict indicator
functions
(is_clean_except_for_contet): rename to ...
(has_non_content_conflicts): ... this; invert sense of test and
rename node_name_conflicts and rename_target_conflicts as above
(has_content_conflicts): new function
(debug_describe_conflicts): add message for missing root dir and
rename node_name_conflicts and rename_target_conflicts as above
(warn_non_content_conflicts): add left and right roster arguments
used to resolve node ids to names; new, somewhat improved, messages
for various conflict types
(roster_merge_result,assign_name,roster_merge,check_result,unit_tests):
rename node_name_conflicts and rename_target_conflicts as above
txt8cWqhLmWi7.txt
Description: Diff [d83907887a2a35229ef361a74e98bd296d84e60c] -> [18b2d521bbb4671537ebfbaf8d79e2bc099cabbf]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 18b2d521bbb4671537ebfbaf8d79e2bc099cabbf,
monotone <=