--- a/hgext/mq.py Wed Jan 25 18:46:20 2023 +0100
+++ b/hgext/mq.py Wed Jan 25 19:12:31 2023 +0100
@@ -1082,7 +1082,7 @@
if merge and files:
# Mark as removed/merged and update dirstate parent info
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
for f in files:
repo.dirstate.update_file_p1(f, p1_tracked=True)
p1 = repo.dirstate.p1()
@@ -1830,7 +1830,7 @@
if keepchanges and tobackup:
raise error.Abort(_(b"local changes found, qrefresh first"))
self.backup(repo, tobackup)
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
for f in a:
repo.wvfs.unlinkpath(f, ignoremissing=True)
repo.dirstate.update_file(
@@ -1988,7 +1988,7 @@
bmlist = repo[top].bookmarks()
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
# XXX do we actually need the dirstateguard
dsguard = None
try: