branch | stable |
changeset 25878 | 800e090e9c64 |
parent 25841 | a2f7e0ba57a6 |
child 26118 | 049005de325e |
child 26405 | c15d8f84343e |
--- a/mercurial/localrepo.py Mon Jul 27 21:27:24 2015 -0400 +++ b/mercurial/localrepo.py Thu Jul 30 06:16:12 2015 +0900 @@ -968,6 +968,9 @@ _("abandoned transaction found"), hint=_("run 'hg recover' to clean up transaction")) + # make journal.dirstate contain in-memory changes at this point + self.dirstate.write() + idbase = "%.40f#%f" % (random.random(), time.time()) txnid = 'TXN:' + util.sha1(idbase).hexdigest() self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)