Comments
Patch
@@ -1545,13 +1545,11 @@ class localrepository(object):
if f not in ctx1 and f not in ctx1.dirs():
self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
match.bad = bad
r = [[], [], [], [], [], [], []]
- if working: # we need to scan the working dir
- r = ctx2._dirstatestatus(match=match, ignored=listignored,
- clean=listclean, unknown=listunknown)
+ r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
if not parentworking:
r = ctx2._generatestatus(ctx1, s, match, listignored, listclean,
listunknown)