Rev 6032: (vila) Fix the known revno dictionary in generate_revision_history(). in file:///home/pqm/archives/thelove/bzr/2.4/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.4/

------------------------------------------------------------
revno: 6032 [merge]
revision-id: pqm at pqm.ubuntu.com-20110812215934-ezzc9jr9oo0cqzub
parent: pqm at pqm.ubuntu.com-20110811152213-htaahpauzcf5vcnr
parent: jelmer at samba.org-20110812103458-g31sf2v6ts1ort35
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Fri 2011-08-12 21:59:34 +0000
message:
  (vila) Fix the known revno dictionary in generate_revision_history().
   (Jelmer Vernooij)
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-08-09 13:23:10 +0000
+++ b/bzrlib/branch.py	2011-08-12 10:34:58 +0000
@@ -785,8 +785,9 @@
                                   other_branch=None):
         """See Branch.generate_revision_history"""
         graph = self.repository.get_graph()
+        (last_revno, last_revid) = self.last_revision_info()
         known_revision_ids = [
-            self.last_revision_info(),
+            (last_revid, last_revno),
             (_mod_revision.NULL_REVISION, 0),
             ]
         if last_rev is not None: