author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 02 Mar 2023 14:44:17 +0100 | |
changeset 50257 | a301f0fad046 |
parent 50256 | a6e0b7d4ae9d |
child 50258 | dba3593555e5 |
hgext/histedit.py | file | annotate | diff | comparison | revisions |
--- 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)),