--- a/mercurial/localrepo.py	Sun Apr 20 16:44:45 2014 -0700
+++ b/mercurial/localrepo.py	Tue Mar 11 18:35:39 2014 -0500
@@ -1558,10 +1558,12 @@
                     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)
-            modified, added, removed, deleted, unknown, ignored, clean = r
+
+        modified, added, removed, deleted, unknown, ignored, clean = r
 
         if not parentworking:
             mf1 = mfmatches(ctx1)