[Monotone-commits-diffs] Revision 29d28dc1bf727e21c22368d7be8f7547603a91e1

[monotone]

-----------------------------------------------------------------
Revision: 29d28dc1bf727e21c22368d7be8f7547603a91e1
Ancestor: 403c68d6c067b60b1fdda3c503a0f31156a57d8a
Author: address@hidden
Date: 2008-06-08T14:25:51
Branch: net.venge.monotone.automate_show_conflict

Added files:
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1
        tests/resolve_duplicate_name_conflict/expected-merged-revision-jim_1
        tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1
Modified files:
        basic_io.cc basic_io.hh cset.cc cset.hh rev_types.hh
        roster.cc roster.hh roster_merge.cc
        tests/resolve_duplicate_name_conflict/__driver__.lua work.cc

ChangeLog: 

Add birth_cause to marking map, for handling sutures in existence merge. Start 
supporting sutures in mark_merge_rosters. Not fully working yet.

* basic_io.cc (stanza::push_str_multi (symbol, symbol, vector<str>)): new.

* basic_io.hh (syms): move symbols used only by rosters to roster.cc

* cset.cc (cset::apply_to): set ancestors in sutured nodes.

* cset.hh (struct editable_tree): set ancestors in sutured nodes;
  requires new get_node virtual function. improve comments.

* rev_types.hh: move declarations of the_null_node, null_ancestors here
  so they are visible wherever node_id is.

* roster.cc (syms): move symbols used only by rosters here from basic_io.hh.
  (dump (birth_cause)): new.
  (dump (marking)): add birth_cause.
  (roster_t::check_sane_against): check birth_cause.
  (editable_roster_base::create_file_node,
   editable_roster_for_merge::create_file_node,
   editable_roster_for_nonmerge::create_file_node): add ancestors.
  (editable_roster_base::get_node): new.
  (union_new_nodes): union suture ancestors.
  (mark_new_node, mark_unmerged_node, mark_merged_node): set birth_cause.
  (mark_merge_roster): handle some suture cases (need more).
  (push_marking): output birth_cause.
  (parse_marking): parse birth_cause
  (roster_t::print_to, roster_t::parse_from): bump roster format version.

* roster.hh: move declarations of the_null_node, null_ancestors to rev_types.hh.
  (struct marking_t): add birth_cause.
  (editable_roster_base::create_file_node): add ancestors.
  (editable_roster_base::get_node): new.

* roster_merge.cc (create_node_for(n, ancestors, roster)): new.
  (insert_if_unborn_or_sutured): renamed from insert_if_unborn, handle suture.
  (merge_nodes): factor out from roster_merge parallel case.
  (roster_merge): Support sutures in existence merge and scalar merge.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Extend to next
  generation of merges; not yet passing.

* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1:
  New file.

* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1:
  New file.

* tests/resolve_duplicate_name_conflict/expected-merged-revision-jim_1:
  New file.

* tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1:
  New file.

* work.cc (editable_working_tree, simulated_working_tree): add ancestors
  to create_file_node, add get_node.

txtum1xHCrduX.txt
Description: Diff [403c68d6c067b60b1fdda3c503a0f31156a57d8a] -> [29d28dc1bf727e21c22368d7be8f7547603a91e1]