Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 23838:b95b9fd7ba29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 11 Jan 2015 23:25:23 -0500
parents 07309e527df7
children 48fd1dfb99aa
line wrap: on
line diff
--- 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):