diff -r 521355a95636 -r 7cfd94ec5d30 mercurial/context.py
--- a/mercurial/context.py	Sun Jul 06 15:43:26 2014 -0400
+++ b/mercurial/context.py	Wed Jul 02 15:24:43 2014 -0500
@@ -1571,6 +1571,7 @@
         files = sorted(set(files))
         self._status = [files, [], [], [], []]
         self._filectxfn = filectxfn
+        self.substate = None
 
         self._extra = extra and extra.copy() or {}
         if self._extra.get('branch', '') == '':