To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.8.7.
- Committer: Vincent Ladeuil
- Date: 2010-03-11 15:18:47 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (5113.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5114.
- Revision ID: v.ladeuil+lp@free.fr-20100311151847-pwmrk7f81i4ymydz
Add whitebox tests for ParentLoop.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Allow the path
passed to resolve to be specialized.
(TestResolveParentLoop): Replace blackbox tests.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Allow the path
passed to resolve to be specialized.
(TestResolveParentLoop): Replace blackbox tests.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
