[Monotone-commits-diffs] Revision ea5009257df6295efbdc68215b30de3664e84a92

[monotone]

-----------------------------------------------------------------
Revision: ea5009257df6295efbdc68215b30de3664e84a92
Ancestor: 259f839c6dde498d8ce856c7607da7bf020a93bf
Author: address@hidden
Date: 2008-10-15T09:45:40
Branch: net.venge.monotone.resolve_conflicts

Added files:
        tests/resolve_conflicts_errors/merge-old-conflicts-file
        tests/resolve_conflicts_multiple_names/__driver__.lua
Added directories:
        tests/resolve_conflicts_multiple_names
Modified files:
        cmd_conflicts.cc monotone.texi
        tests/automate_show_conflicts/__driver__.lua
        tests/resolve_conflicts_errors/__driver__.lua

ChangeLog: 

conflict resolutions: add more tests.

* cmd_conflicts.cc (set_duplicate_name_conflict): check for inconsistent
  left/right resolutions.

* monotone.texi (Conflicts): doc why 'interactive' not supported for two
  file conflicts.

* tests/automate_show_conflicts/__driver__.lua (first): improve comment

* tests/resolve_conflicts_errors/__driver__.lua: improve revision labels.
  Add more tests.

* tests/resolve_conflicts_multiple_names: New test. this resolution not
  implemented yet; this test documents a test case that must work when it
  is.

txtTdQ05uqpe6.txt
Description: Diff [259f839c6dde498d8ce856c7607da7bf020a93bf] -> [ea5009257df6295efbdc68215b30de3664e84a92]