[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision ab21ddc77289e2dcff60b26a94ef8f524cde3b
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision ab21ddc77289e2dcff60b26a94ef8f524cde3b2f |
Date: |
Wed, 28 Nov 2007 06:07:49 +0100 |
-----------------------------------------------------------------
Revision: ab21ddc77289e2dcff60b26a94ef8f524cde3b2f
Ancestor: caff093817d38b595a6768bb9e940d6f5508bd03
Author: address@hidden
Date: 2007-11-28T04:03:09
Branch: net.venge.monotone.cleanup.conflict-messages
Modified files:
roster_merge.cc roster_merge.hh
tests/non_content_conflicts/__driver__.lua
tests/show_conflicts/__driver__.lua
ChangeLog:
* roster_merge.cc (debug_describe_conflicts):
(roster_merge_result::warn_non_content_conflicts): replace
nid1/nid2 with left_nid/right_nid to track which side of a merge
the nids came from
(side_t): new enum describing left/right side of merge
(assign_name): add argument describing which side of a merge the
current nid/name come from; use side to put current nid in
left_nid or right_nid of convergent_name_conflict structure if
there is a conflict
(copy_node_forward): add argument describing which side of a merge
the nid/name pair come from
(roster_merge): add side argument to copy_node_forward calls in
the in_left/in_right attachment cases; derive side argument from
winning name of the in_both attachment case and add it to the
assign_name call
(simple_convergent_name_conflict::check):
(convergent_name_plus_missing_root::check): rename nid1/nid2 to
left_nid/right_nid in the convergent name conflict structure and
simplify checks against expected values
* roster_merge.hh (convergent_name_conflict): rename nid1/nid2 to
left_nid/right_nid
* tests/non_content_conflicts/__driver__.lua: split convergent
name case into 3 sub-cases and put each on its own branch to keep
the test graphs simple
* tests/show_conflicts/__driver__.lua: update for renamed conflict
types divergent_name_conflicts and convergent_name_conflicts
txtF5Jv2LQNV5.txt
Description: Diff [caff093817d38b595a6768bb9e940d6f5508bd03] -> [ab21ddc77289e2dcff60b26a94ef8f524cde3b2f]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision ab21ddc77289e2dcff60b26a94ef8f524cde3b2f,
monotone <=