Commits

Steve Borho committed a359ba4

status: hg-1.7 mergestate objects require explicit commits

Comments (0)

Files changed (1)

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:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.