← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-15 09:22:57 UTC
  • mfrom: (6069.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110815092257-dqso39eg1ogfrlg7
(vila) Merge 2.4 into trunk (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
780
780
                                  other_branch=None):
781
781
        """See Branch.generate_revision_history"""
782
782
        graph = self.repository.get_graph()
 
783
        (last_revno, last_revid) = self.last_revision_info()
783
784
        known_revision_ids = [
784
 
            self.last_revision_info(),
 
785
            (last_revid, last_revno),
785
786
            (_mod_revision.NULL_REVISION, 0),
786
787
            ]
787
788
        if last_rev is not None: