##// END OF EJS Templates
branch: pass current transaction when writing branch in histedit
marmoute -
r51152:a301f0fa default
parent child Browse files
Show More
@@ -581,7 +581,7 b' class histeditaction:'
581 with repo.ui.silent():
581 with repo.ui.silent():
582 hg.update(repo, self.state.parentctxnode, quietempty=True)
582 hg.update(repo, self.state.parentctxnode, quietempty=True)
583 stats = applychanges(repo.ui, repo, rulectx, {})
583 stats = applychanges(repo.ui, repo, rulectx, {})
584 repo.dirstate.setbranch(rulectx.branch())
584 repo.dirstate.setbranch(rulectx.branch(), repo.currenttransaction())
585 if stats.unresolvedcount:
585 if stats.unresolvedcount:
586 raise error.InterventionRequired(
586 raise error.InterventionRequired(
587 _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
587 _(b'Fix up the change (%s %s)') % (self.verb, short(self.node)),
General Comments 0
You need to be logged in to leave comments. Login now