[Monotone-commits-diffs] Revision 2811cde4d7b44ba5d5bf73ef82ed9eb41056f80d

[monotone]

-----------------------------------------------------------------
Revision: 2811cde4d7b44ba5d5bf73ef82ed9eb41056f80d
Ancestor: 7797cab88ceb3f54487cb619a16ed7102c13b3ec
Author: address@hidden
Date: 2008-09-10T00:25:05
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
Modified files:
        roster_merge.cc
        tests/resolve_conflicts_read_all/__driver__.lua

ChangeLog: 

conflict show_remaining; implement more conflicts. Still not done.

* roster_merge.cc (read_directory_loop_conflict)
  (read_multiple_name_conflict, read_multiple_name_conflicts)
  (read_attr_state_left, read_attr_state_right, read_attribute_conflict)
  (read_attribute_conflicts): implement.
  (roster_merge_result::write_conflict_file): write all conflicts, not
  just the ones we can resolve.

* tests/resolve_conflicts_read_all/__driver__.lua: Finish converting to
  read_all (was copied from another test).

txt6M9aEpNVrR.txt
Description: Diff [7797cab88ceb3f54487cb619a16ed7102c13b3ec] -> [2811cde4d7b44ba5d5bf73ef82ed9eb41056f80d]