diff hgext/rebase.py @ 39328:94a4980695f8

rebase: skip extinct revisions even if it has no successor in rebase set Differential Revision: https://phab.mercurial-scm.org/D4408
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 12 Jul 2018 12:11:20 -0700
parents 485a3349d5ee
children 7198cdbbbde1
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Jul 11 12:26:44 2018 -0700
+++ b/hgext/rebase.py	Thu Jul 12 12:11:20 2018 -0700
@@ -1891,7 +1891,7 @@
                 # 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(s in destmap for s in succrevs):
+                if srcrev in extinctrevs or any(s in destmap for s in succrevs):
                     obsoletewithoutsuccessorindestination.add(srcrev)
 
     return (