changeset 50260 | e60f9168263c |
parent 49961 | 7a8bfc05b691 |
child 51686 | 493034cc3265 |
child 51814 | 23116aefe786 |
--- 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).