[Pkg-bazaar-commits] ./bzr-gtk/unstable r25: never ignore leftmost parent

[David Allouche]

------------------------------------------------------------
revno: 25
committer: David Allouche <david.allouche at canonical.com>
timestamp: Mon 2005-11-28 01:02:17 +0100
message:
  never ignore leftmost parent
modified:
  graph.py
-------------- next part --------------
=== modified file 'graph.py'
--- a/graph.py	2005-11-27 23:51:06 +0000
+++ b/graph.py	2005-11-28 00:02:17 +0000
@@ -120,9 +120,11 @@
     for revid in reversed(sorted_revids):
         revision = revisions[revid]
         parent_ids = parent_ids_of[revision]
-        # ignore candidate parents which are an ancestor of another parent
+        # ignore candidate parents which are an ancestor of another parent, but
+        # never ignore the leftmost parent
         redundant_ids = []
-        for candidate_id in list(parent_ids):
+        ignorable_parent_ids = parent_ids[1:] # never ignore leftmost
+        for candidate_id in ignorable_parent_ids: 
             for parent_id in list(parent_ids):
                 if candidate_id in ancestor_ids_of[parent_id]:
                     redundant_ids.append(candidate_id)