Commits

Steve Borho committed a359ba4

status: hg-1.7 mergestate objects require explicit commits

  • Participants
  • Parent commits cb7602c
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgtk/status.py

             ms = merge_.mergestate(self.repo)
             for wfile in files:
                 ms.mark(wfile, "u")
+            ms.commit()
             self.reload_status()
         def mark(menuitem, files):
             ms = merge_.mergestate(self.repo)
             for wfile in files:
                 ms.mark(wfile, "r")
+            ms.commit()
             self.reload_status()
         def resolve(stat, files):
             wctx = self.repo[None]
             mctx = wctx.parents()[-1]
+            ms = merge_.mergestate(self.repo)
             for wfile in files:
-                ms = merge_.mergestate(self.repo)
                 ms.resolve(wfile, wctx, mctx)
+            ms.commit()
             self.reload_status()
         def resolve_with(stat, tool, files):
             if tool: