--- a/hgext/rebase.py	Thu Apr 05 10:13:45 2018 -0700
+++ b/hgext/rebase.py	Thu Apr 05 11:01:42 2018 -0700
@@ -21,7 +21,6 @@
 
 from mercurial.i18n import _
 from mercurial.node import (
-    nullid,
     nullrev,
     short,
 )
@@ -252,7 +251,7 @@
                     else:
                         destrev = legacydest
                     destmap[oldrev] = destrev
-                    if newrev in (nullid, revtodostr):
+                    if newrev == revtodostr:
                         state[oldrev] = revtodo
                         # Legacy compat special case
                     else: