--- a/hgext/largefiles/overrides.py Wed Jan 25 18:46:20 2023 +0100
+++ b/hgext/largefiles/overrides.py Wed Jan 25 19:12:31 2023 +0100
@@ -660,7 +660,7 @@
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
- with lfdirstate.parentchange(repo):
+ with lfdirstate.changing_parents(repo):
for lfile, args, msg in actions[
MERGE_ACTION_LARGEFILE_MARK_REMOVED
]:
@@ -1800,7 +1800,7 @@
raise error.ProgrammingError(
b'largefiles is not compatible with in-memory merge'
)
- with lfdirstate.parentchange(repo):
+ with lfdirstate.changing_parents(repo):
result = orig(repo, node, branchmerge, force, *args, **kwargs)
newstandins = lfutil.getstandinsstate(repo)