From patchwork Wed Mar 25 12:16:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1, of, 2] revert: comment that filesets are always evaluated against workingctx From: Yuya Nishihara X-Patchwork-Id: 8258 Message-Id: To: mercurial-devel@selenic.com Date: Wed, 25 Mar 2015 21:16:13 +0900 # HG changeset patch # User Yuya Nishihara # Date 1421472141 -32400 # Sat Jan 17 14:22:21 2015 +0900 # Node ID fc35f6b8a2365bcdb143b5d6dfbf3707517f96c5 # Parent 5b85a5bc5bbb9d8365953609d98e4dce7110e9b0 revert: comment that filesets are always evaluated against workingctx diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -2797,7 +2797,9 @@ def revert(ui, repo, ctx, parents, *pats # need all matching names in dirstate and manifest of target rev, # so have to walk both. do not print errors if files exist in one - # but not other. + # but not other. in both cases, filesets should be evaluated against + # workingctx to get consistent result (issue4497). this means 'set:**' + # cannot be used to select missing files from target rev. # `names` is a mapping for all elements in working copy and target revision # The mapping is in the form: