To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.8.8.
- Committer: Vincent Ladeuil
- Date: 2010-03-12 09:35:28 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-20100312093528-e6itb10tvkiujmbs
Exhibit bug #537956.
* bzrlib/conflicts.py:
(ParentLoop.format): Fix parameter order to correctly reflect the
attempted action leading to the conflict.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.scenarios): Add one scenario with known
failures.
* bzrlib/conflicts.py:
(ParentLoop.format): Fix parameter order to correctly reflect the
attempted action leading to the conflict.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.scenarios): Add one scenario with known
failures.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
