# HG changeset patch # User Matt Harbison # Date 1421036723 18000 # Node ID b95b9fd7ba29d0cb27538b1d7bffb1b2b4acf7ce # Parent 2b79d124a12fb911cf9aff61232be3af3b174527 forget: don't report rejected files as forgotten as well It seems like a mistake to report a file as forgotten and rejected. The forgotten list doesn't seem to be used by anything in core, so no test changes. diff -r 2b79d124a12f -r b95b9fd7ba29 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sun Jan 11 23:20:51 2015 -0500 +++ b/mercurial/cmdutil.py Sun Jan 11 23:25:23 2015 -0500 @@ -2057,7 +2057,7 @@ rejected = wctx.forget(forget, prefix) bad.extend(f for f in rejected if f in match.files()) - forgot.extend(forget) + forgot.extend(f for f in forget if f not in rejected) return bad, forgot def remove(ui, repo, m, prefix, after, force, subrepos):