[Monotone-commits-nodiffs] Revision 0792c2168ee9402e1494ddd499a5cd1e38365069

[monotone]

-----------------------------------------------------------------
Revision: 0792c2168ee9402e1494ddd499a5cd1e38365069
Ancestor: 53c414155805d1e6a66bea6a0686415013a4936a
Author: address@hidden
Date: 2008-08-14T20:00:38
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/resolve_duplicate_name_conflict_multiple_parents/__driver__.lua
Added directories:
        tests/resolve_duplicate_name_conflict_multiple_parents
Modified files:
        cmd_merging.cc merge.cc merge.hh roster.cc roster.hh
        roster_merge.cc roster_merge.hh ss-existence-merge.text

ChangeLog: 

Finish existence merge case i test 
(resolve_duplicate_name_conflict_multiple_parents); passing. Other tests not 
yet run.

* cmd_merging.cc: Add temp node id source as required by
  resolve_merge_conflicts. Add left_rid, right_rid arguments to
  mark_merge_roster.

* merge.hh:
* merge.cc (resolve_merge_conflicts): Pass in temp_node_id_source, don't
  declare locally in resolve_duplicate_name_conflicts.
  (interactive_merge_and_store): Declare temp_node_id_source as needed by
  roster_merge, resolve_merge_conflicts.

* roster.cc (syms): Alphabetize. Add birth_parent.
  (dump(std::map<node_id, revision_id>)): new.
  (temp_node): Make public.
  (mark_new_node): Add left_rid, right_rid arguments, for birth record.
  (mark_merged_node): Add left_rid, right_rid arguments, record recursive
  suture parents in birth record.
  (mark_merge_roster): Add left_rid, right_rid arguments, for birth
  records.
  (push_marking, parse_marking): Put each parent on a separate line, for
  simpler parsing.

* roster.hh (struct marking_t): Change birth record to store parent birth
  revision as well.

* roster_merge.cc (dump(suture_drop_conflict)): new.
  (push_node_id_set): Push node numbers; names are not needed, not
  available.
  (parse_node_id_set): New.
  (parse_suture_drop_conflicts): Finish.
  (parse_resolve_conflicts_str): Add resolved_user for file content
  conflicts.
  (find_common_ancestor_nodes): Use parent birth revisions stored in
  marking map birth record.
  (check_scalars_modified): New.
  (insert_sutured): Finish case i.
  (roster_merge): Handle automatic sutures from existence step.

* roster_merge.hh (struct suture_scalar_conflict): New.

* ss-existence-merge.text: Improve examples, describe storing birth
  revisions in birth record.

* tests/resolve_duplicate_name_conflict_multiple_parents: New file.

* tests/resolve_duplicate_name_conflict_multiple_parents/__driver__.lua: New 
file.


monotone --db={your.database} diff 
--revision=53c414155805d1e6a66bea6a0686415013a4936a 
--revision=0792c2168ee9402e1494ddd499a5cd1e38365069
----------------------------------------------------------------------