##// END OF EJS Templates
rebase: clarify a little by calculating a set in Python instead of in revset...
Martin von Zweigbergk -
r44627:4263aaab default
parent child Browse files
Show More
@@ -1767,8 +1767,9 def defineparents(repo, rev, destmap, st
1767 continue
1767 continue
1768 # Revisions in the side (not chosen as merge base) branch that
1768 # Revisions in the side (not chosen as merge base) branch that
1769 # might contain "surprising" contents
1769 # might contain "surprising" contents
1770 other_bases = set(bases) - {base}
1770 siderevs = list(
1771 siderevs = list(
1771 repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)
1772 repo.revs(b'(%ld %% (%d+%d))', other_bases, base, dest)
1772 )
1773 )
1773
1774
1774 # If those revisions are covered by rebaseset, the result is good.
1775 # If those revisions are covered by rebaseset, the result is good.
General Comments 0
You need to be logged in to leave comments. Login now