changeset 23838 | b95b9fd7ba29 |
parent 23772 | 07309e527df7 |
child 23876 | 48fd1dfb99aa |
--- 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):