← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-06-19 14:49:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2537.
  • Revision ID: abentley@panoramicfeedback.com-20070619144906-zx160g6h377j729h
Fix handling of null revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
813
813
                to_revision = osutils.safe_revision_id(to_revision)
814
814
            merger.other_rev_id = to_revision
815
815
            if merger.other_rev_id is None:
816
 
                raise error.NoCommits(branch)
 
816
                raise errors.NoCommits(branch)
817
817
            self.branch.fetch(branch, last_revision=merger.other_rev_id)
818
818
            merger.other_basis = merger.other_rev_id
819
819
            merger.other_tree = self.branch.repository.revision_tree(