Viewing all changes in revision 3619.6.4.
- Committer: Mark Hammond
- Date: 2008-08-12 11:37:21 UTC
- mto: (3691.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 3692.
- Revision ID: mhammond@skippinet.com.au-20080812113721-13deviynbqzwrul7
do_merge gets one 'finally' per lock so locks always released on failure.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
