[Monotone-commits-diffs] Revision d228b97bf9cfff6d215df28e1a71d87c327c0d09

[monotone]

-----------------------------------------------------------------
Revision: d228b97bf9cfff6d215df28e1a71d87c327c0d09
Ancestor: ee57fe487ffcfd442877e9f43cf6c952fa585ecf
Author: address@hidden
Date: 2008-09-01T21:40:34
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/automate_file_merge/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
Added directories:
        tests/automate_file_merge
        tests/resolve_conflicts_all_merge_commands
Modified files:
        cmd_merging.cc monotone.texi roster_merge.cc roster_merge.hh
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/resolve_content_conflict/__driver__.lua
        tests/resolve_content_conflict/conflicts-1
        tests/resolve_content_conflict/merge-1
        tests/resolve_content_conflict/resolve-conflicts-1
        tests/resolve_content_conflict/update-1
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Delete resolve_conflicts_opts from workspace commands; not supported.
Implement resolve_conflicts_opts for all merge commands. All tests except
resolve_duplicate_name conflicts passing; that's testing the remaining
stuff that needs to be implemented.

* cmd_merging.cc (CMD(update), CMD(merge_into_workspace), CMD(pluck)):
  delete resolve_conflicts_opts; not supported for workspace.
  (CMD(merge_into_dir)): Fix handling of conflict resolution options.
  (CMD_AUTOMATE(file_merge)): new.

* monotone.texi (Automation): add file_merge

* roster_merge.cc:
  (put_content_conflict):
  (parse_file_content_conflicts):
  (roster_merge_result::report_file_content_conflicts):
  (roster_merge_result::resolve_file_content_conflicts): allow arbitrary
  path for conflict resolution file.

  (parse_resolve_conflicts_str):
  (parse_duplicate_name_conflicts): conflict resolution file name is an
  external name.

* roster_merge.hh (struct file_content_conflict): allow arbitrary
  path for conflict resolution file.

* tests/automate_file_merge: New file.

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

* tests/automate_show_conflicts/expected-content-attached.stdout: Add
  'resolved_internal' resolutions.

* tests/resolve_conflicts_all_merge_commands: New file.

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

* tests/resolve_content_conflict/__driver__.lua:
* tests/resolve_content_conflict/conflicts-1: 
* tests/resolve_content_conflict/merge-1: 
* tests/resolve_content_conflict/resolve-conflicts-1: 
* tests/resolve_content_conflict/update-1:  Test that user conflict
  resolution file can be workspace or bookkeeping path.

txtkhrnHgsfXk.txt
Description: Diff [ee57fe487ffcfd442877e9f43cf6c952fa585ecf] -> [d228b97bf9cfff6d215df28e1a71d87c327c0d09]