--- a/mercurial/context.py Mon Oct 13 14:18:47 2014 -0700
+++ b/mercurial/context.py Fri Oct 03 21:44:10 2014 -0700
@@ -1418,9 +1418,9 @@
subrepos = []
if '.hgsub' in self:
subrepos = sorted(self.substate)
- s = self._repo.dirstate.status(match, subrepos, listignored,
- listclean, listunknown)
- cmp, modified, added, removed, deleted, unknown, ignored, clean = s
+ cmp, s = self._repo.dirstate.status(match, subrepos, listignored,
+ listclean, listunknown)
+ modified, added, removed, deleted, unknown, ignored, clean = s
# check for any possibly clean files
if cmp: