[Monotone-commits-nodiffs] Revision 53c414155805d1e6a66bea6a0686415013a4936a

[monotone]

-----------------------------------------------------------------
Revision: 53c414155805d1e6a66bea6a0686415013a4936a
Ancestor: 805e663619ced91f301f1e2214f1efa3e6196a6b
Author: address@hidden
Date: 2008-08-11T16:11:02
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        cmd_merging.cc merge.cc roster.cc roster.hh roster_merge.cc
        roster_merge.hh ss-existence-merge.text

ChangeLog: 

Improve ss-existence-merge.text. Add suture_drop conflicts, start 
suture_suture_conflicts. Does not compile; commit for backup.

* merge.cc (resolve_merge_conflicts):
* cmd_merging.cc (show_conflicts_core): add suture_drop_conflicts.

* roster.hh (struct marking_t): Add type birth_record_t, rename
  birth_cause to birth_record; handle suture parents that are sutured.

* roster.cc: match changes in marking_t birth info.

* roster_merge.cc: Match rewritten ss-existence-merge.text; not done. Add
  suture_drop conflicts.
  (roster_merge_result::resolve_duplicate_name_conflicts): Use external
  node_id_source.

* roster_merge.hh: Add list of places to add support for new conflicts.
  Finish suture_drop_conflict. Start suture_suture_conflict.
  (roster_merge): Add temp node id source.

* ss-existence-merge.text: Add sutured parents of sutures. Rewrite
  processing description.



monotone --db={your.database} diff 
--revision=805e663619ced91f301f1e2214f1efa3e6196a6b 
--revision=53c414155805d1e6a66bea6a0686415013a4936a
----------------------------------------------------------------------