Skip to content
Snippets Groups Projects
Commit 88645288 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

status: don't drop unknown and ignored information (issue4321)

By the magic of code movement, we ended up dropping unknown and ignored
information when comparing the working directory with a non-parent revision.

Let's stop doing it and add a test.
parent 412ac613
No related branches found
No related tags found
No related merge requests found
......@@ -120,7 +120,7 @@
mf2 = self._manifestmatches(match, s)
modified, added, clean = [], [], []
deleted, unknown, ignored = s[3], [], []
deleted, unknown, ignored = s[3], s[4], s[5]
withflags = mf1.withflags() | mf2.withflags()
for fn, mf2node in mf2.iteritems():
if fn in mf1:
......
......@@ -280,6 +280,12 @@
R removed
C deleted
status against non-parent with unknown file (issue4321)
$ touch unknown
$ hg status --rev 0 unknown
? unknown
status of removed but existing in working directory. "? removed" should
not be included:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment