monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 365319fc94f5191f924d45536e0f265a4652d5


From: monotone
Subject: [Monotone-commits-diffs] Revision 365319fc94f5191f924d45536e0f265a4652d525
Date: Sun, 29 Jun 2008 13:45:43 +0200

-----------------------------------------------------------------
Revision: 365319fc94f5191f924d45536e0f265a4652d525
Ancestor: c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b
Author: address@hidden
Date: 2008-06-22T06:35:42
Branch: net.venge.monotone.automate_show_conflict

Deleted entries:
        tests/resolve_duplicate_name_conflict/checkout.sh-merged
Added files:
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_3-beth_3
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-jim_1-beth_2
        tests/resolve_duplicate_name_conflict/expected-update-messages-beth_3
        tests/resolve_duplicate_name_conflict/expected-update-messages-jim_2
        tests/resolve_duplicate_name_conflict/merge-beth_2-jim_1-conflicts
Modified files:
        basic_io.cc basic_io.hh cmd_merging.cc diff_patch.cc
        diff_patch.hh merge.cc monotone.texi options_list.hh
        roster.cc roster.hh 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
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1
        
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1-conflicts
        tests/resolve_duplicate_name_conflict/expected-merged-revision-jim_1
        tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1
        
tests/resolve_duplicate_name_conflict/merge-abe_2-jim_1-resolve_conflicts

ChangeLog: 

Add content conflict resolutions, support additional merge and update suture 
cases. resolve_duplicate_name_conflict test is now complete and passes.

* basic_io.hh (stanza::push_symbol):
* basic_io.cc (stanza::push_symbol): new.

* cmd_merging.cc (three_way_merge): Add content_merge_adaptor for testing
  whether internal merger will succeed for content conflicts.
  (CMD update, CMD merge_into_dir, CMD merge_into_workspace, CMD pluck): pass
  content_merge_adaptor to three_way_merge.
  (show_conflicts_core): pass content_merge_adaptor to roster_merge.

* diff_patch.cc (content_merger::attempt_auto_merge): factor out
  attempt_auto_merge from try_auto_merge.
  (content_merger::try_user_merge): Move lua parameter here from
  constructor; simplifies using attempt_auto_merge.

* diff_patch.hh (struct content_merger): Move lua hook from struct to
  try_user_merge param. Add attempt_auto_merge.

* merge.cc (namespace): Move get_file_details to roster.cc, so it can
  also be used by roster_merge.cc.
  (resolve_merge_conflicts): Handle content conflicts. Move error
  messages here from roster_merge.cc parse_resolve_conflicts_opts.
  (interactive_merge_and_store): pass content_merge_adaptor to
  roster_merge for testing whether internal merger will succeed for
  content conflicts.

* monotone.texi (Merge Conflicts): Start documenting conflict resolution.
  (Automation show_conflicts): Output 'resolved_internal' for file
  content conflicts if internal line merger will succeed.

* options_list.hh (resolve_conflicts_file): Fix documentation string.

* roster.cc (mark_merged_node): Handle birth_revision for a previously
  sutured node.
  (roster_t::get_file_details): Move here from merge.cc.

* roster.hh (class roster_t get_file_details): Move here from merge.cc.

* roster_merge.cc (syms): Add resolved_internal, resolved_user for
  content resolution.
  (put_attr_conflict): Delete FIXMEs
  (put_content_conflict): Output conflict resolution if not 'none'.
  (resolve_conflicts::do_auto_merge): new; implement resolved_internal.
  (parse_duplicate_name_conflicts): Improve error message.
  (parse_file_content_conflicts): New; implement content conflict
  resolutions
  (parse_resolve_conflicts_opts): add file_content_conflicts. Move error
  messages to roster_merge.cc resolve_merge_conflicts.
  (roster_merge_result::resolve_file_content_conflicts): New.
  (auto_merge_succeeds): New for testing whether internal merger will succeed.
  (merge_nodes, roster_merge): Add parameters required by auto_merge_succeeds

* roster_merge.hh (resolve_conflicts::resolution_t): Add content conflict
  resolution.
  (struct file_content_conflict): Add resolution.
  (struct roster_merge_result::resolve_file_content_conflicts): new.
  (roster_merge): Add parameters required by auto_merge_succeeds.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Verify contents
  of checkout.sh at each step. Construct file contents so internal line
  merger succeeds at one merge. Implement entire test case; now passes.

* tests/resolve_duplicate_name_conflict/checkout.sh-merged: no longer needed.

* tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1:
* tests/resolve_duplicate_name_conflict/expected-merged-revision-jim_1:
* 
tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_2-jim_1-conflicts:
* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_1-beth_1:
  Match file content changes.

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

* tests/resolve_duplicate_name_conflict/expected-merge-messages-abe_3-beth_3: 
New file.

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

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

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

* tests/resolve_duplicate_name_conflict/merge-abe_2-jim_1-resolve_conflicts:
  change resolution name.

* tests/resolve_duplicate_name_conflict/merge-beth_2-jim_1-conflicts: New file.

Attachment: txt2L9DRxKQdm.txt
Description: Diff [c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b] -> [365319fc94f5191f924d45536e0f265a4652d525]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]