Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: pass current transaction when writing branch in merge
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 02 Mar 2023 14:44:43 +0100
changeset 50260 e60f9168263c
parent 50259 a44e489940e0
child 50261 774ed116dd7c
branch: pass current transaction when writing branch in merge
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Thu Mar 02 14:44:33 2023 +0100
+++ b/mercurial/merge.py	Thu Mar 02 14:44:43 2023 +0100
@@ -2229,7 +2229,9 @@
                 util.unlink(repo.vfs.join(b'updatestate'))
 
                 if not branchmerge:
-                    repo.dirstate.setbranch(p2.branch())
+                    repo.dirstate.setbranch(
+                        p2.branch(), repo.currenttransaction()
+                    )
 
                 # If we're updating to a location, clean up any stale temporary includes
                 # (ex: this happens during hg rebase --abort).
Mercurial