Mercurial > hg

changeset 25693:a6c1eac2fb1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: collaborate with the transaction when moving bookmarks We have code moving bookmarks from the old changeset to the new one within the transaction scope. Yet this code was still writing to disk instead of handing the change to the transaction. This changeset fixes this.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 30 Jun 2015 22:36:49 -0700
parents 9f6e0e7ef828
children 5ede49f4383a
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Jun 29 17:10:36 2015 -0400
+++ b/mercurial/cmdutil.py	Tue Jun 30 22:36:49 2015 -0700
@@ -2615,7 +2615,7 @@
                     marks = repo._bookmarks
                     for bm in bms:
                         marks[bm] = newid
-                    marks.write()
+                    marks.recordchange(tr)
             #commit the whole amend process
             createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
             if createmarkers and newid != old.node():