~bzr-pqm/bzr/bzr.dev

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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: