Rev 4617: Fix a bug in MergeSorter that was fixed only in the inlined pop_node in http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

------------------------------------------------------------
revno: 4617
revision-id: john at arbash-meinel.com-20090814213309-nkysroljd3wizane
parent: john at arbash-meinel.com-20090814201235-hwd48ysxqhlj6dpy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.19-known-graph-sorted
timestamp: Fri 2009-08-14 16:33:09 -0500
message:
  Fix a bug in MergeSorter that was fixed only in the inlined pop_node
-------------- next part --------------
=== modified file 'bzrlib/tsort.py'
--- a/bzrlib/tsort.py	2009-08-13 21:30:07 +0000
+++ b/bzrlib/tsort.py	2009-08-14 21:33:09 +0000
@@ -706,11 +706,12 @@
         else:
             # no parents, use the root sequence
             root_count = self._revno_to_branch_count.get(0, 0)
+            root_count = self._revno_to_branch_count.get(0, -1)
+            root_count += 1
             if root_count:
                 revno = (0, root_count, 1)
             else:
                 revno = (1,)
-            root_count += 1
             self._revno_to_branch_count[0] = root_count
 
         # store the revno for this node for future reference