diff -r 9640ccf44ac0 -r 7c0f40f4f7bf mercurial/fileset.py --- a/mercurial/fileset.py Sat Mar 31 23:58:08 2018 -0400 +++ b/mercurial/fileset.py Sat Mar 31 23:37:25 2018 -0700 @@ -513,7 +513,7 @@ revspec = getstring(r, reverr) if not revspec: raise error.ParseError(reverr) - basenode, node = scmutil.revpair(repo, [baserevspec, revspec]) + basenode, node = scmutil.revpairnodes(repo, [baserevspec, revspec]) basectx = repo[basenode] ctx = repo[node] return getset(mctx.switch(ctx, _buildstatus(ctx, x, basectx=basectx)), x)