← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2005-09-18 21:37:03 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050918213703-20437815d381a735
Set a pending_merge if the merge base is forced to revno 0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
890
890
    def lookup_revision(self, revision):
891
891
        """Return the revision identifier for a given revision information."""
892
892
        revno, info = self._get_revision_info(revision)
 
893
        assert info is not None or revno == 0, (info, revno)
893
894
        return info
894
895
 
895
896