Rev 118: Cope with ghosts in svn-upgrade. in file:///home/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 118
revision-id: jelmer at samba.org-20090131221224-s8whiskiqrwfh55j
parent: jelmer at samba.org-20090130161712-iwjk9pcfp00qth2o
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2009-01-31 23:12:24 +0100
message:
  Cope with ghosts in svn-upgrade.
modified:
  NEWS                           news-20070721005510-kbjm9yxqoeczq9fl-1
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'NEWS'
--- a/NEWS	2009-01-30 15:29:25 +0000
+++ b/NEWS	2009-01-31 22:12:24 +0000
@@ -1,5 +1,9 @@
 0.4.3	UNRELEASED
 
+ BUG FIXES
+
+  * Cope with ghosts in svn-upgrade. (#320113)
+
  PERFORMANCE
 
   * Register commands lazily, should reduce import time when unused.

=== modified file 'rebase.py'
--- a/rebase.py	2008-08-31 20:30:21 +0000
+++ b/rebase.py	2009-01-31 22:12:24 +0000
@@ -210,6 +210,10 @@
     children = {}
     parent_map = {}
     for r, ps in ancestry:
+        if not children.has_key(r):
+            children[r] = []
+        if ps is None: # Ghost
+            continue
         parent_map[r] = ps
         if not children.has_key(r):
             children[r] = []