[Monotone-commits-diffs] Revision 0e1b9d7942c906a1e796aa38dadf06a93fb7e5f1

[monotone]

-----------------------------------------------------------------
Revision: 0e1b9d7942c906a1e796aa38dadf06a93fb7e5f1
Ancestor: 41f8b559d209521fd9ba6b099e5eda9b46fc33d6
Author: address@hidden
Date: 2008-07-07T07:22:09
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/resolve_duplicate_name_conflict_drop_vs_suture/__driver__.lua
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_a_b-conflicts-resolve
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts-resolve-1
        
tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-conflicts-resolve-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-1
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_e_f-message-3
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_g_d-message-1
        tests/resolve_duplicate_name_conflict_drop_vs_suture/merge_g_d-message-2
        tests/resolve_duplicate_name_conflict_drop_vs_suture/update-message-1
Added directories:
        tests/resolve_duplicate_name_conflict_drop_vs_suture
Modified files:
        cmd_merging.cc merge.cc monotone.texi roster_merge.cc
        roster_merge.hh ss-existence-merge.text testlib.lua

ChangeLog: 

Support content/drop conflicts.

* cmd_merging.cc (find_heads_to_merge): handle heads.size == 2 here.
  (CMD merge): only do first merge if conflict resolutions specified.
  (show_conflicts_core): report content_drop conflicts.
  (CMD_AUTOMATE show_conflicts): heads.size == 2 handled in find_heads_to_merge.

* merge.cc (resolve_merge_conflicts): report and resolve content_drop conflicts

* monotone.texi (Merge Conflicts): doc that merge only does first merge
  when conflict resolutions given.

* roster_merge.cc (dump duplicate_name_conflict): dump resolution.
 (dump content_drop_conflict): new.
 (namespace syms): add content_drop conflict symbols.
 (roster_merge_result::report_content_drop_conflicts): new.
 (parse_content_drop_conflicts): new.
 (parse_resolve_conflicts_str): parse content_drop resolutions.
 (roster_merge_result::resolve_duplicate_name_conflicts): error if no
 resolution given.
 (roster_merge_result::resolve_content_drop_conflicts): new.
 (insert_if_unborn_or_sutured): detect content_drop conflict.
 (side_t): move to header in resolve_conflicts namespace.

* roster_merge.hh (resolve_conflicts): Add content_drop resolutions. Move
  side_t here.
  (struct content_drop_conflict): new.
  (dump content_drop_conflict): new.
  (struct roster_merge_result): add content_drop_conflicts.

* ss-existence-merge.text: Document content_drop_conflicts.

* testlib.lua: clean up trailing whitespace. Add samefilestd.

* tests/resolve_duplicate_name_conflict_drop_vs_suture: New test.

txti5l2GCQ3md.txt
Description: Diff [41f8b559d209521fd9ba6b099e5eda9b46fc33d6] -> [0e1b9d7942c906a1e796aa38dadf06a93fb7e5f1]