[Monotone-commits-nodiffs] Revision db337bc730cc15eae78f94a423bc460823b07e0a

[monotone]

-----------------------------------------------------------------
Revision: db337bc730cc15eae78f94a423bc460823b07e0a
Ancestor: d228b97bf9cfff6d215df28e1a71d87c327c0d09
Author: address@hidden
Date: 2008-09-02T02:30:59
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/resolve_conflict_all_resolutions/__driver__.lua
        tests/resolve_conflict_all_resolutions/conflicts-1
        tests/resolve_duplicate_name_conflict/conflicts-1
Added directories:
        tests/resolve_conflict_all_resolutions
Modified files:
        cmd_merging.cc roster_merge.cc roster_merge.hh
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Add resolve_conflict command to edit conflicts file generated by automate 
show_conflicts. Not done; need to add more conflict resolutions.

* cmd_merging.cc (CMD(resolve_conflict)): New command.

* roster_merge.cc (syms): Add conflict resolution symbols.
  (parse_duplicate_name_conflict): refactor into
  read_duplicate_name_conflict, read_duplicate_name_conflicts,
  validate_duplicate_name_conflicts
  (parse_file_content_conflicts): refactor.
  (read_conflict_file_core): split out of parse_resolve_conflicts_opts.
  (roster_merge_result::read_conflict_file): new.
  (roster_merge_result::set_first_conflict): new.
  (roster_merge_result::write_conflict_file): new.
  (parse_resolve_conflicts_opts): use system_path. use read_conflict_file_core.
  (roster_merge_result::resolve_file_content_conflicts): use system_path.

* roster_merge.hh (struct roster_merge_result): add conflict editing
  operations: read_conflict_file, set_first_conflict, write_conflict_file

* tests/resolve_conflict_all_resolutions: New test for new command; not
  passing yet.

* tests/resolve_duplicate_name_conflict/__driver__.lua: delete unneeded code.

* tests/resolve_duplicate_name_conflict/conflicts-1: New file.


monotone --db={your.database} diff 
--revision=d228b97bf9cfff6d215df28e1a71d87c327c0d09 
--revision=db337bc730cc15eae78f94a423bc460823b07e0a
----------------------------------------------------------------------