Mercurial > public > mercurial-scm > hg-stable

comparison 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 23116aefe786 493034cc3265
comparison
equal deleted inserted replaced
50259:a44e489940e0 50260:e60f9168263c
2227 ) 2227 )
2228 # update completed, clear state 2228 # update completed, clear state
2229 util.unlink(repo.vfs.join(b'updatestate')) 2229 util.unlink(repo.vfs.join(b'updatestate'))
2230 2230
2231 if not branchmerge: 2231 if not branchmerge:
2232 repo.dirstate.setbranch(p2.branch()) 2232 repo.dirstate.setbranch(
2233 p2.branch(), repo.currenttransaction()
2234 )
2233 2235
2234 # If we're updating to a location, clean up any stale temporary includes 2236 # If we're updating to a location, clean up any stale temporary includes
2235 # (ex: this happens during hg rebase --abort). 2237 # (ex: this happens during hg rebase --abort).
2236 if not branchmerge: 2238 if not branchmerge:
2237 sparse.prunetemporaryincludes(repo) 2239 sparse.prunetemporaryincludes(repo)