/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-19 21:22:56 UTC
  • mfrom: (2490.2.29 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
[MERGE] handle null revision properly for LCA

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(