~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-29 18:21:57 UTC
  • mfrom: (1711.2.72 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
(jam) add run_bzr_error, clean up remerge tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
from bzrlib.option import Option
15
15
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
16
16
                             NULL_REVISION)
 
17
from bzrlib.revisionspec import RevisionSpec
17
18
from bzrlib.trace import note
18
19
from bzrlib import urlutils
19
20
 
141
142
            fileobj = file(output, 'wb')
142
143
        else:
143
144
            fileobj = sys.stdout
144
 
        target_branch.repository.lock_read()
145
 
        try:
146
 
            write_bundle(target_branch.repository, target_revision,
147
 
                         base_revision, fileobj)
148
 
        finally:
149
 
            target_branch.repository.unlock()
 
145
        write_bundle(target_branch.repository, target_revision, base_revision,
 
146
                     fileobj)
150
147
 
151
148
 
152
149
class cmd_verify_changeset(Command):