~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

Merge in format-5 work - release bzr 0.1rc1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
304
304
        from branch import Branch
305
305
        from revision import common_ancestor, MultipleRevisionSources
306
306
        other_branch = Branch.open_containing(self.spec)
307
 
        revision_a = branch.last_patch()
308
 
        revision_b = other_branch.last_patch()
 
307
        revision_a = branch.last_revision()
 
308
        revision_b = other_branch.last_revision()
309
309
        for r, b in ((revision_a, branch), (revision_b, other_branch)):
310
310
            if r is None:
311
311
                raise NoCommits(b)