mercurial/localrepo.py
changeset 21475 c6976a4a39db
parent 21472 77dbd05471cd
child 21478 3b647aed4394
--- a/mercurial/localrepo.py	Mon Apr 21 22:12:59 2014 -0500
+++ b/mercurial/localrepo.py	Tue Apr 22 12:43:20 2014 -0500
@@ -1550,9 +1550,7 @@
             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._buildstatus(ctx1, r, match, listignored, listclean,