[Monotone-commits-nodiffs] Revision 647ae8f26c120d3a0175227173fef119424ec832

[monotone]

-----------------------------------------------------------------
Revision: 647ae8f26c120d3a0175227173fef119424ec832
Ancestor: 6f166933d80a5d0dc86afb3d9c7e307d775ee21d
Author: address@hidden
Date: 2008-05-09T08:49:09
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        cmd_merging.cc merge.cc merge.hh options_list.hh
        roster_merge.cc roster_merge.hh
        tests/resolve_duplicate_name_conflict/__driver__.lua

ChangeLog: 

Partially implement resolution of duplicate names conflict via renames.

* cmd_merging.cc (CMD(merge_into_dir)),
 (CMD(update)),
 (CMD(merge_into_workspace)),
 (CMD(pluck)): Pass app.opts to resolve_merge_conflicts.
 (merge_two): Pass opts to interactive_merge_and_store.
 (CMD(merge)): Accept resolve_conflict_opts.

    note: other commands (probably all) should also accept
    resolve_conflict_opts - later.

* merge.hh,
* merge.cc (resolve_merge_conflicts): Take opts parameter, handle
  resolve_conflicts (just duplicate names for now).
  (interactive_merge_and_store): Take opts parameter, pass to
  resolve_merge_conflicts.

* options_list.hh (OPTSET(resolve_conflict_opts)): New.

* roster_merge.hh (struct roster_merge_result),
* roster_merge.cc: Add
  roster_merge_result::resolve_duplicate_name_conflicts and associated
  stuff.

* tests/resolve_duplicate_name_conflict/__driver__.lua: Comment out 'checkout' 
test case; only implemented renaming so far.


monotone --db={your.database} diff 
--revision=6f166933d80a5d0dc86afb3d9c7e307d775ee21d 
--revision=647ae8f26c120d3a0175227173fef119424ec832
----------------------------------------------------------------------