changeset 29139 | 64c1955a0461 |
parent 29119 | a032ebea4e97 |
child 29146 | b175d9cc3ee8 |
--- a/mercurial/revset.py Thu May 05 09:26:09 2016 +0000 +++ b/mercurial/revset.py Tue May 03 12:36:44 2016 +0900 @@ -386,9 +386,7 @@ r = fullreposet(repo) xs = reachableroots(repo, getset(repo, r, x), getset(repo, r, y), includepath=True) - # XXX We should combine with subset first: 'subset & baseset(...)'. This is - # necessary to ensure we preserve the order in subset. - return xs & subset + return subset & xs def andset(repo, subset, x, y): return getset(repo, getset(repo, subset, x), y)