[Monotone-commits-diffs] Revision 149964e56ca39cc3964df25ab54e2f4748aa13d5

[monotone]

-----------------------------------------------------------------
Revision: 149964e56ca39cc3964df25ab54e2f4748aa13d5
Ancestor: 8afeea33a55abf47e7dace13d0216bbc19405dba
Author: address@hidden
Date: 2008-03-24T00:55:59
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/automate_show_conflicts/expected-multiple-names.stdout
Modified files:
        roster_merge.cc
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout

ChangeLog: 

automate show_conflicts: Output ancestor file id, tests pass thru multiple names

* roster_merge.cc (put_rename_conflict_left, put_rename_conflict_right):
  Output ancestor file id, to allow fetching all three files involved in
  a rename conflict, in case they are also modified.
  (roster_merge_result::report_multiple_name_conflicts): Finish
  supporting multiple name conflicts for automate show_conflicts.

* tests/automate_show_conflicts/expected-orphaned-rename.stdout:
* tests/automate_show_conflicts/expected-invalid-rename.stdout: Output
  ancestor file id.

* tests/automate_show_conflicts/expected-multiple-names.stdout: New file.

txtqFahDEAmpI.txt
Description: Diff [8afeea33a55abf47e7dace13d0216bbc19405dba] -> [149964e56ca39cc3964df25ab54e2f4748aa13d5]