##// END OF EJS Templates
largefile: use parentchange during mergerecordupdates...
marmoute -
r48449:4b17971f default
parent child Browse files
Show More
@@ -650,12 +650,15 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 # this should be executed before 'orig', to execute 'remove'
654 for lfile, args, msg in actions[
655 # before all other actions
655 MERGE_ACTION_LARGEFILE_MARK_REMOVED
656 repo.dirstate.remove(lfile)
656 ]:
657 # make sure lfile doesn't get synclfdirstate'd as normal
657 # this should be executed before 'orig', to execute 'remove'
658 lfdirstate.add(lfile)
658 # before all other actions
659 repo.dirstate.remove(lfile)
660 # make sure lfile doesn't get synclfdirstate'd as normal
661 lfdirstate.add(lfile)
659 lfdirstate.write()
662 lfdirstate.write()
660
663
661 return orig(repo, actions, branchmerge, getfiledata)
664 return orig(repo, actions, branchmerge, getfiledata)
General Comments 0
You need to be logged in to leave comments. Login now