Rev 6070: Merge 2.4 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6070 [merge]
revision-id: v.ladeuil+lp at free.fr-20110815072004-qpjh00pbf9vrh1n6
parent: pqm at pqm.ubuntu.com-20110814012348-8sg40gtq2rls03fa
parent: pqm at pqm.ubuntu.com-20110813220938-gw2gkvz4q5uq0qry
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2011-08-15 09:20:04 +0200
message:
  Merge 2.4 into trunk
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-08-12 09:49:24 +0000
+++ b/bzrlib/branch.py	2011-08-15 07:20:04 +0000
@@ -780,8 +780,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: