Viewing all changes in revision 4597.7.16.
- Committer: Vincent Ladeuil
- Date: 2010-03-10 10:31:45 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-20100310103145-7qyepzvdoeooezx2
Some cleanup.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentsConflict, TestResolvePathConflict): Cleanup
scenarios and sme method names.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts): Cleanup common parameter which
are really test class attributes.
* bzrlib/conflicts.py:
(PathConflict._infer_file_id): Cleaned up.
* bzrlib/tests/test_conflicts.py:
(TestResolveContentsConflict, TestResolvePathConflict): Cleanup
scenarios and sme method names.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts): Cleanup common parameter which
are really test class attributes.
* bzrlib/conflicts.py:
(PathConflict._infer_file_id): Cleaned up.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
