hgext/rebase.py
changeset 44247 4263aaab651d
parent 44095 e733c59f3c09
child 44248 1cb7ae9b0071
--- a/hgext/rebase.py	Wed Jan 15 15:12:50 2020 -0800
+++ b/hgext/rebase.py	Wed Jan 15 10:44:23 2020 -0800
@@ -1767,8 +1767,9 @@
                 continue
             # Revisions in the side (not chosen as merge base) branch that
             # might contain "surprising" contents
+            other_bases = set(bases) - {base}
             siderevs = list(
-                repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)
+                repo.revs(b'(%ld %% (%d+%d))', other_bases, base, dest)
             )
 
             # If those revisions are covered by rebaseset, the result is good.