« back to all changes in this revision
Viewing changes to bzrlib/tests/test_conflicts.py
- Committer: Vincent Ladeuil
- Date: 2009-10-19 15:19:17 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-20091019151917-iq24uo0t89d2ut9g
Implement --interactive for PathConflict.
* bzrlib/tests/test_conflicts.py:
(TestResolvePathConflict): Tests for --interactive.
* bzrlib/conflicts.py:
(PathConflict): Add actions for --interactive.
(TextConflict): Ensure TextConflict is not solved like a
PathConflict (this double the FIXME about inheritance or put
weight behind the idea that we should define a ConflictSolver
hierarchy independent from the Conflict hierarchy...).
* bzrlib/tests/test_conflicts.py:
(TestResolvePathConflict): Tests for --interactive.
* bzrlib/conflicts.py:
(PathConflict): Add actions for --interactive.
(TextConflict): Ensure TextConflict is not solved like a
PathConflict (this double the FIXME about inheritance or put
weight behind the idea that we should define a ConflictSolver
hierarchy independent from the Conflict hierarchy...).
- files modified:
- bzrlib/conflicts.py
added
removed
bzrlib/tests/test_conflicts.py
