Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 26748 5ba0a99ff27f
parent 26745 8af610bce239
child 26781 1aee2ab0f902 
--- a/hgext/rebase.py	Sat Oct 17 01:15:34 2015 +0900
+++ b/hgext/rebase.py	Sat Oct 17 01:15:34 2015 +0900
@@ -628,7 +628,7 @@
         merge.update(repo, p1, False, True, False)
     else:
         repo.ui.debug(" already in target\n")
-    repo.dirstate.write()
+    repo.dirstate.write(repo.currenttransaction())
     repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
     if base is not None:
         repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
mercurial