Viewing all changes in revision 4597.2.29.
- Committer: Vincent Ladeuil
- Date: 2010-03-02 07:58:53 UTC
- mto: (5067.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5068.
- Revision ID: v.ladeuil+lp@free.fr-20100302075853-6mpnlk1p7ezlfnli
Fixed as per Andrew's review comments.
* bzrlib/conflicts.py:
(ContentsConflict._take_it_with_cleanups): Use
OperationWithCleanups to ensure a clean error handling.
* bzrlib/conflicts.py:
(ContentsConflict._take_it_with_cleanups): Use
OperationWithCleanups to ensure a clean error handling.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
