Mercurial > hg

diff mercurial/merge.py @ 50260:e60f9168263c

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
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Mar 2023 14:44:43 +0100
parents 7a8bfc05b691
children 493034cc3265 23116aefe786
line wrap: on
line diff
--- 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).