« back to all changes in this revision
Viewing changes to bzrlib/conflicts.py
- Committer: Vincent Ladeuil
- Date: 2010-03-24 11:34:16 UTC
- mto: (4597.8.12 537956-parent-loop-incomplete) (5112.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5113.
- Revision ID: v.ladeuil+lp@free.fr-20100324113416-7bn3q4qsjkrn2c1m
Start addressing Andrew's concerns.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts): Add a docstring.
(TestResolvePathConflictBefore531967.assertPathConflict): Really
inject the old fashioned conflict object.
* bzrlib/merge.py:
(Merge3Merger._merge_names): Better explain why we shouldn't
generate helpers at this point.
(Merge3Merger.cook_conflicts): Be more verbose when failing.
* bzrlib/conflicts.py:
(PathConflict._resolve): Be more verbose when failing.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts): Add a docstring.
(TestResolvePathConflictBefore531967.assertPathConflict): Really
inject the old fashioned conflict object.
* bzrlib/merge.py:
(Merge3Merger._merge_names): Better explain why we shouldn't
generate helpers at this point.
(Merge3Merger.cook_conflicts): Be more verbose when failing.
* bzrlib/conflicts.py:
(PathConflict._resolve): Be more verbose when failing.
- files modified:
- bzrlib/conflicts.py
added
removed
bzrlib/conflicts.py
