# HG changeset patch # User Pierre-Yves David # Date 1677764657 -3600 # Node ID a301f0fad0467be93b059789d416e19b1f5cdf0b # Parent a6e0b7d4ae9dcf0516d62258ddc0ba84dab641df branch: pass current transaction when writing branch in histedit diff -r a6e0b7d4ae9d -r a301f0fad046 hgext/histedit.py --- a/hgext/histedit.py Thu Mar 02 11:47:18 2023 +0100 +++ b/hgext/histedit.py Thu Mar 02 14:44:17 2023 +0100 @@ -581,7 +581,7 @@ with repo.ui.silent(): hg.update(repo, self.state.parentctxnode, quietempty=True) stats = applychanges(repo.ui, repo, rulectx, {}) - repo.dirstate.setbranch(rulectx.branch()) + repo.dirstate.setbranch(rulectx.branch(), repo.currenttransaction()) if stats.unresolvedcount: raise error.InterventionRequired( _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),