← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-15 07:20:04 UTC
  • mfrom: (6015.9.12 2.4)
  • mto: This revision was merged to the branch mainline in revision 6070.
  • Revision ID: v.ladeuil+lp@free.fr-20110815072004-qpjh00pbf9vrh1n6
Merge 2.4 into trunk

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: