[Monotone-commits-diffs] Revision 1abc945a3eb4ff09919ecd5ef487dea70f515be2

[monotone]

-----------------------------------------------------------------
Revision: 1abc945a3eb4ff09919ecd5ef487dea70f515be2
Ancestor: f62b989aee18ebc004790a4e488d5d0692899465
Author: address@hidden
Date: 2008-03-30T22:56:00
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
Modified files:
        NEWS roster_merge.cc
        
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua

ChangeLog: 

automate show_conflicts: Add missing basic_io cases.

* NEWS: Added 'automate show_conflicts'

* roster_merge.cc (roster_merge_result::report_missing_root_conflicts)
  (roster_merge_result::report_invalid_name_conflicts)
  (roster_merge_result::report_orphaned_node_conflicts): Add missing
  basic_io cases.

* 
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout:
 Add missing detail.

* tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua: Add
  test of automate show_conflicts for this case.

* tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout: New file.

txt0cUsB3pyH2.txt
Description: Diff [f62b989aee18ebc004790a4e488d5d0692899465] -> [1abc945a3eb4ff09919ecd5ef487dea70f515be2]