mercurial/context.py
branchstable
changeset 21971 412ac613fd89
parent 21938 c8411fb5dfef
child 21972 8864528874f7
--- a/mercurial/context.py	Fri Aug 01 11:45:26 2014 -0500
+++ b/mercurial/context.py	Fri Aug 01 13:13:24 2014 -0700
@@ -135,6 +135,10 @@
             elif fn not in deleted:
                 added.append(fn)
         removed = mf1.keys()
+        if removed:
+            # need to filter files if they are already reported as removed
+            unknown = [fn for fn in unknown if fn not in mf1]
+            ignored = [fn for fn in ignored if fn not in mf1]
 
         return [modified, added, removed, deleted, unknown, ignored, clean]