Show More
@@ -683,18 +683,12 b' def overridecalculateupdates(' | |||||
683 | def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): |
|
683 | def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): | |
684 | if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: |
|
684 | if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: | |
685 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
|
685 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | |
686 | with lfdirstate.changing_parents(repo): |
|
686 | for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]: | |
687 | for lfile, args, msg in actions[ |
|
687 | # this should be executed before 'orig', to execute 'remove' | |
688 | MERGE_ACTION_LARGEFILE_MARK_REMOVED |
|
688 | # before all other actions | |
689 | ]: |
|
689 | repo.dirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) | |
690 | # this should be executed before 'orig', to execute 'remove' |
|
690 | # make sure lfile doesn't get synclfdirstate'd as normal | |
691 | # before all other actions |
|
691 | lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) | |
692 | repo.dirstate.update_file( |
|
|||
693 | lfile, p1_tracked=True, wc_tracked=False |
|
|||
694 | ) |
|
|||
695 | # make sure lfile doesn't get synclfdirstate'd as normal |
|
|||
696 | lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) |
|
|||
697 | lfdirstate.write(repo.currenttransaction()) |
|
|||
698 |
|
692 | |||
699 | return orig(repo, actions, branchmerge, getfiledata) |
|
693 | return orig(repo, actions, branchmerge, getfiledata) | |
700 |
|
694 |
General Comments 0
You need to be logged in to leave comments.
Login now