Viewing all changes in revision 4597.3.22.
- Committer: Vincent Ladeuil
- Date: 2009-10-16 13:13:47 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091016131347-iq5r1y8p6r9fj9m1
More failing tests.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestMixin): Renamed from TestBase, no need to contrain all
daughter classes to inherit from TestCaseWithTransport.
(TestResolve): Add a failing test for --interactive option.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestMixin): Renamed from TestBase, no need to contrain all
daughter classes to inherit from TestCaseWithTransport.
(TestResolve): Add a failing test for --interactive option.
- files modified:
- bzrlib/tests/blackbox/test_conflicts.py
expand all
collapse all
added
removed
