# HG changeset patch # User Pierre-Yves David # Date 1406924004 25200 # Node ID 412ac613fd89cbd82fd56f6f08308e5cd95f58d8 # Parent 27205c8335b06d8a2718b85c71adfaa3287cec35 status: explicitly exclude removed file from unknown and ignored Changeset 64fe488b5179 introduced a test to validate that file were not reported twice when both unknown and removed. This behavior change was introduced by 65cdc6bab91e alongside a bug that dropped ignored and unknown completely (issue4321). As we are going to fix the bug, we need a proper implementation of the behavior tested in 64fe488b5179. diff -r 27205c8335b0 -r 412ac613fd89 mercurial/context.py --- 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]