##// END OF EJS Templates
status: don't drop unknown and ignored information (issue4321)...
Pierre-Yves David -
r21972:88645288 stable
parent child Browse files
Show More
@@ -120,7 +120,7 b' class basectx(object):'
120 mf2 = self._manifestmatches(match, s)
120 mf2 = self._manifestmatches(match, s)
121
121
122 modified, added, clean = [], [], []
122 modified, added, clean = [], [], []
123 deleted, unknown, ignored = s[3], [], []
123 deleted, unknown, ignored = s[3], s[4], s[5]
124 withflags = mf1.withflags() | mf2.withflags()
124 withflags = mf1.withflags() | mf2.withflags()
125 for fn, mf2node in mf2.iteritems():
125 for fn, mf2node in mf2.iteritems():
126 if fn in mf1:
126 if fn in mf1:
@@ -280,6 +280,12 b' hg status -A --change 1 and revset:'
280 R removed
280 R removed
281 C deleted
281 C deleted
282
282
283 status against non-parent with unknown file (issue4321)
284
285 $ touch unknown
286 $ hg status --rev 0 unknown
287 ? unknown
288
283 status of removed but existing in working directory. "? removed" should
289 status of removed but existing in working directory. "? removed" should
284 not be included:
290 not be included:
285
291
General Comments 0
You need to be logged in to leave comments. Login now