--- a/mercurial/scmutil.py Sun Nov 09 19:57:02 2014 -0500
+++ b/mercurial/scmutil.py Wed Nov 26 14:27:36 2014 -0500
@@ -721,9 +721,15 @@
similarity = float(opts.get('similarity') or 0)
rejected = []
- m.bad = lambda x, y: rejected.append(x)
+ origbad = m.bad
+ def badfn(f, msg):
+ if f in m.files():
+ origbad(f, msg)
+ rejected.append(f)
+ m.bad = badfn
added, unknown, deleted, removed, forgotten = _interestingfiles(repo, m)
+ m.bad = origbad
unknownset = set(unknown + forgotten)
toprint = unknownset.copy()