[Monotone-commits-diffs] Revision 5c7d3a8c99168c3ccadb0a268a49b14cb5e7725f

[monotone]

-----------------------------------------------------------------
Revision: 5c7d3a8c99168c3ccadb0a268a49b14cb5e7725f
Ancestor: 2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7
Author: address@hidden
Date: 2008-03-21T23:56:16
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        automate.cc cmd_merging.cc merge.cc merge.hh roster_merge.cc
        roster_merge.hh tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-1.stdout
        tests/automate_show_conflicts/expected-2.stdout

ChangeLog: 

Automate show_conflicts two added files now works; need all other
conflict cases.

* automate.cc (show_conflicts): Fix bug in getting r_id from heads.

* merge.hh:
* merge.cc:
* cmd_merging.cc: Add db param to resolve_merge_conflicts,
  report_duplicate_name_conflicts.

* roster_merge.cc (roster_merge_result::report_duplicate_name_conflicts):
  Add db param. Get correct file id, but only for both added files case.
  Cope with adaptor.get_ancestral_roster using basic_io::printer internally.

* roster_merge.hh (roster_merge_result::report_duplicate_name_conflicts):
  Add db param.

* tests/automate_show_conflicts/__driver__.lua: Fix order when revisions
  specified on command line. Now passing, but needs more test cases.

* tests/automate_show_conflicts/expected-1.stdout: Now correct.

* tests/automate_show_conflicts/expected-2.stdout: Now correct.

txtO2thextBvM.txt
Description: Diff [2734ae9d9ed1dc5ec36bfb10bee6af3887be8bb7] -> [5c7d3a8c99168c3ccadb0a268a49b14cb5e7725f]