Mercurial > hg

diff hgext/rebase.py @ 38239:ead71b15efd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Wed, 06 Jun 2018 13:31:24 -0400
parents 64280cd4b454 69d1cafe75f2
children f4f1fb1cbfb4
line wrap: on
line diff
--- a/hgext/rebase.py	Sat May 26 03:01:14 2018 +0530
+++ b/hgext/rebase.py	Wed Jun 06 13:31:24 2018 -0400
@@ -1815,7 +1815,8 @@
                 # If 'srcrev' has a successor in rebase set but none in
                 # destination (which would be catched above), we shall skip it
                 # and its descendants to avoid divergence.
-                if any(nodemap[s] in destmap for s in successors):
+                if any(nodemap[s] in destmap for s in successors
+                       if s in nodemap):
                     obsoletewithoutsuccessorindestination.add(srcrev)
 
     return (