~marienz/bzr-builddeb/initial-merge-upstream

Viewing all changes in revision 365.

  • Committer: James Westby
  • Date: 2009-08-25 10:27:07 UTC
  • Revision ID: james.westby@canonical.com-20090825102707-6u0rzfoup612tk8j
Fix locking in merge-package.

Don't unlock the temporary branch until we are done with it, makes sure
that the revisions can be retrieved by the merge.

Also remove the temporary directory when we are done with it.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: