Viewing all changes in revision 4597.3.64.
- Committer: Vincent Ladeuil
- Date: 2010-01-06 11:18:45 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-20100106111845-inun0xxl8rx4yvst
Fixed as per Aaron's remark.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.test_resolve_keeping_mine,
TestResolveParentLoop.test_resolve_taking_theirs): Toghten the
tests as debug showed they were passing with bogus code.
* bzrlib/conflicts.py:
(ParentLoop.take_theirs): Use a TreeTransform to safely rename
multiple files at once.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.test_resolve_keeping_mine,
TestResolveParentLoop.test_resolve_taking_theirs): Toghten the
tests as debug showed they were passing with bogus code.
* bzrlib/conflicts.py:
(ParentLoop.take_theirs): Use a TreeTransform to safely rename
multiple files at once.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
