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