Show More
@@ -654,7 +654,9 b' def mergerecordupdates(orig, repo, actio' | |||||
654 | ]: |
|
654 | ]: | |
655 | # this should be executed before 'orig', to execute 'remove' |
|
655 | # this should be executed before 'orig', to execute 'remove' | |
656 | # before all other actions |
|
656 | # before all other actions | |
657 |
repo.dirstate. |
|
657 | repo.dirstate.update_file( | |
|
658 | lfile, p1_tracked=True, wc_tracked=False | |||
|
659 | ) | |||
658 | # make sure lfile doesn't get synclfdirstate'd as normal |
|
660 | # make sure lfile doesn't get synclfdirstate'd as normal | |
659 | lfdirstate.add(lfile) |
|
661 | lfdirstate.add(lfile) | |
660 | lfdirstate.write() |
|
662 | lfdirstate.write() |
General Comments 0
You need to be logged in to leave comments.
Login now