##// END OF EJS Templates
largefile: use parentchange during mergerecordupdates...
marmoute -
r48449:4b17971f default
parent child Browse files
Show More
@@ -650,7 +650,10 b' def overridecalculateupdates('
650 def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
650 def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
651 if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
651 if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
652 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
652 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
653 for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]:
653 with lfdirstate.parentchange():
654 for lfile, args, msg in actions[
655 MERGE_ACTION_LARGEFILE_MARK_REMOVED
656 ]:
654 # this should be executed before 'orig', to execute 'remove'
657 # this should be executed before 'orig', to execute 'remove'
655 # before all other actions
658 # before all other actions
656 repo.dirstate.remove(lfile)
659 repo.dirstate.remove(lfile)
General Comments 0
You need to be logged in to leave comments. Login now