changeset 39328 | 94a4980695f8 |
parent 39135 | 485a3349d5ee |
child 39915 | 7198cdbbbde1 |
--- 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 (