diff -r c166b212bdee -r 7a8bfc05b691 mercurial/commands.py --- a/mercurial/commands.py Wed Jan 25 18:46:20 2023 +0100 +++ b/mercurial/commands.py Wed Jan 25 19:12:31 2023 +0100 @@ -6264,7 +6264,7 @@ # # All this should eventually happens, but in the mean time, we use this # context manager slightly out of the context it should be. - with repo.dirstate.parentchange(repo): + with repo.dirstate.changing_parents(repo): mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) if not didwork and pats: