mercurial/context.py

--- a/mercurial/context.py	Wed Jul 08 17:01:09 2015 +0900
+++ b/mercurial/context.py	Wed Jul 08 17:01:09 2015 +0900
@@ -1517,6 +1517,10 @@
                 try:
                     for f in fixup:
                         normal(f)
+                    # write changes out explicitly, because nesting
+                    # wlock at runtime may prevent 'wlock.release()'
+                    # below from doing so for subsequent changing files
+                    self._repo.dirstate.write()
                 finally:
                     wlock.release()
             except error.LockError: