Rev 3465: Remove the workaround in status, assuming that set_parent_(trees/ids) will do it for us. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/status_double_pending_235407

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/status_double_pending_235407

------------------------------------------------------------
revno: 3465
revision-id: john at arbash-meinel.com-20080603175114-orr0xe2xg41dus7n
parent: john at arbash-meinel.com-20080602160909-u5q4mzn2ou6kz2r7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_double_pending_235407
timestamp: Tue 2008-06-03 12:51:14 -0500
message:
  Remove the workaround in status, assuming that set_parent_(trees/ids) will do it for us.
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
-------------- next part --------------
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2008-05-30 22:29:04 +0000
+++ b/bzrlib/status.py	2008-06-03 17:51:14 +0000
@@ -159,11 +159,6 @@
         are considered ghosts should not be present in the map.
     :return: iterator from MergeSorter.iter_topo_order()
     """
-    if not revision_ids:
-        # For whatever reason, there are no unique revisions for this node.
-        # This could happen if you merge an ancestor of an already merged
-        # revision (or merge the revision itself 2x).
-        return iter([(1, tip_revision, 0, 0)])
     # MergeSorter requires that all nodes be present in the graph, so get rid
     # of any references pointing outside of this graph.
     parent_graph = {}