Rev 11: Don't change the meaning of history - needs test. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 11
revision-id: jelmer at samba.org-20070704220938-qjvoljldyr2t6rqi
parent: jelmer at samba.org-20070704220327-q2dxrr0w0vbq03lh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr-rebase
timestamp: Thu 2007-07-05 00:09:38 +0200
message:
  Don't change the meaning of history - needs test.
modified:
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'rebase.py'
--- a/rebase.py	2007-07-04 22:03:27 +0000
+++ b/rebase.py	2007-07-04 22:09:38 +0000
@@ -171,13 +171,16 @@
         children = list(find_revision_children(r))
         # Add entry for them in replace_map
         for c in children:
+            if c in renames:
+                continue
             rev = repository.get_revision(c)
             if replace_map.has_key(c):
                 parents = replace_map[c][1]
             else:
                 parents = rev.parent_ids
             # replace r in parents with replace_map[r][0]
-            parents[parents.index(r)] = replace_map[r][0]
+            if not replace_map[r][0] in parents:
+                parents[parents.index(r)] = replace_map[r][0]
             replace_map[c] = (generate_revid(rev), parents)
             assert replace_map[c][0] != rev.revision_id
         # Add them to todo[]