To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.7.6.
- Committer: Vincent Ladeuil
- Date: 2010-03-04 15:40:16 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-20100304154016-qa1erjzmrxa94kfm
Cleanup TestParametrizedResolveConflicts some more.
* bzrlib/tests/test_conflicts.py:
(resolve_conflict_scenarios): Add a _base_action parameter to
avoid creating useless items.
(TestParametrizedResolveConflicts.do_create_file,
TestParametrizedResolveConflicts.do_create_file): New helpers.
* bzrlib/tests/test_conflicts.py:
(resolve_conflict_scenarios): Add a _base_action parameter to
avoid creating useless items.
(TestParametrizedResolveConflicts.do_create_file,
TestParametrizedResolveConflicts.do_create_file): New helpers.
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
