Viewing all changes in revision 4597.7.8.
- Committer: Vincent Ladeuil
- Date: 2010-03-05 10:23:55 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5113.
- Revision ID: v.ladeuil+lp@free.fr-20100305102355-fiu8pue5ujd2aux6
Some refactoring to help address bug #531967.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Use 'path' as
the parameter name as it's clearer than 'item'.
* bzrlib/conflicts.py:
(PathConflict._resolve): Implement the rename with a proper
TreeTransform. This doesn't address bug #531967 yet.
(PathConflict._get_or_infer_file_id): First (unsuccesful) try to
infer the file-id.
(ContentsConflict._resolve): Renamed from _take_it.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Use 'path' as
the parameter name as it's clearer than 'item'.
* bzrlib/conflicts.py:
(PathConflict._resolve): Implement the rename with a proper
TreeTransform. This doesn't address bug #531967 yet.
(PathConflict._get_or_infer_file_id): First (unsuccesful) try to
infer the file-id.
(ContentsConflict._resolve): Renamed from _take_it.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
