[Monotone-commits-diffs] Revision 42a07ab393a277cedd3dfb69238d08e57753e922

[monotone]

-----------------------------------------------------------------
Revision: 42a07ab393a277cedd3dfb69238d08e57753e922
Ancestor: 29d28dc1bf727e21c22368d7be8f7547603a91e1
Author: address@hidden
Date: 2008-06-10T23:23:28
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        hybrid_map.hh merge.cc parallel_iter.hh roster.cc
        roster_merge.cc roster_merge.hh
        tests/resolve_duplicate_name_conflict/__driver__.lua
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1

ChangeLog: 

Handle merge with sutured node, at least when suture is on the right.

* hybrid_map.hh: add const_reverse_iterator.

* merge.cc (try_to_merge_files): use conflict.get_ancestor_roster, to
  support sutures in conflicts.

* parallel_iter.hh: add reverse_iter

* roster.cc (dump(birth_cause)): cleanup formatting of output.
  (shallow_equal): check ancestors.
  (mark_new_node): set birth_cause correctly for suture.
  (mark_merge_roster): Implement suture for 'exists_in_left && !exists_in_right'
  (parse_marking): do suture, split properly.

* roster_merge.cc (dump(file_content_conflict)): replace nid with
  left_nid, right_nid, result_nid for suture.
  (put_content_conflict): simplify, use conflict.get_ancestor_roster to
  handle suture.
  (file_content_conflict::get_ancestor_roster): new.
  (roster_merge_result::report_file_content_conflicts): handle conflict
  with sutured node.
  (insert_if_unborn_or_sutured): handle merging with a sutured node
  properly.
  (roster_merge): handle merging with a sutured node properly; use
  reverse_iter to optimize.

* roster_merge.hh (struct file_content_conflict): replace nid with
  left_nid, right_nid, result_nid for suture. Add get_ancestor_roster.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Doc conflicts on
  merging abe_2 with jim_1.

* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1 
(mtn): Match rev id changes.

txt0D9YBrPYz4.txt
Description: Diff [29d28dc1bf727e21c22368d7be8f7547603a91e1] -> [42a07ab393a277cedd3dfb69238d08e57753e922]