~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/branch.py

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-12 21:59:34 UTC
mfrom: (6015.18.1 2.4-generate-revhistory)
mto: (6069.1.1 trunk) (6015.24.1 2.4) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6206.1.1 2.5-client-reconnect-819604) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6082.5.1 expand-in-stack)
mto: This revision was merged to the branch mainline in revision 6070.
Revision ID: pqm@pqm.ubuntu.com-20110812215934-ezzc9jr9oo0cqzub

(vila) Fix the known revno dictionary in generate_revision_history().
(Jelmer Vernooij)

added added

removed removed

785

other_branch=None):

786

"""See Branch.generate_revision_history"""

787

graph = self.repository.get_graph()

788

(last_revno, last_revid) = self.last_revision_info()

788

789

known_revision_ids = [

789

self.last_revision_info(),

790

(last_revid, last_revno),

790

791

(_mod_revision.NULL_REVISION, 0),

791

792

]

792

793

if last_rev is not None: