Show More
@@ -658,7 +658,7 b' def mergerecordupdates(orig, repo, actio' | |||||
658 | lfile, p1_tracked=True, wc_tracked=False |
|
658 | lfile, p1_tracked=True, wc_tracked=False | |
659 | ) |
|
659 | ) | |
660 | # make sure lfile doesn't get synclfdirstate'd as normal |
|
660 | # make sure lfile doesn't get synclfdirstate'd as normal | |
661 | lfdirstate.add(lfile) |
|
661 | lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) | |
662 | lfdirstate.write() |
|
662 | lfdirstate.write() | |
663 |
|
663 | |||
664 | 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