diff -r 3160876c6e4e -r 70354bd4f19b hgext/rebase.py
--- a/hgext/rebase.py	Thu Aug 10 22:17:15 2017 -0700
+++ b/hgext/rebase.py	Fri Aug 11 01:34:11 2017 -0700
@@ -461,12 +461,10 @@
                                        editor=editor,
                                        keepbranches=self.keepbranchesf,
                                        date=self.date)
-            if newnode is None:
-                newrev = self.dest
-            else:
+            if newnode is not None:
                 newrev = repo[newnode].rev()
-            for oldrev in self.state.iterkeys():
-                self.state[oldrev] = newrev
+                for oldrev in self.state.iterkeys():
+                    self.state[oldrev] = newrev
 
         if 'qtip' in repo.tags():
             updatemq(repo, self.state, self.skipped, **opts)