← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Martin Pool
  • Date: 2005-08-04 22:04:31 UTC
  • Revision ID: mbp@sourcefrog.net-20050804220431-77c59d269649fac9
- fix import

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
644
644
    def run(self, from_location, to_location=None, revision=None):
645
645
        import errno
646
646
        from bzrlib.merge import merge
647
 
        from bzrlib.branch import DivergedBranches, NoSuchRevision, \
 
647
        from bzrlib.branch import DivergedBranches, \
648
648
             find_cached_branch, Branch
649
649
        from shutil import rmtree
650
650
        from meta_store import CachedStore
691
691
                    revno, rev_id = br_from.get_revision_info(revision[0])
692
692
                try:
693
693
                    br_to.update_revisions(br_from, stop_revision=revno)
694
 
                except NoSuchRevision:
 
694
                except bzrlib.errors.NoSuchRevision:
695
695
                    rmtree(to_location)
696
696
                    msg = "The branch %s has no revision %d." % (from_location,
697
697
                                                                 revno)