Show More
@@ -1819,7 +1819,14 b' def mergeupdate(orig, repo, node, branch' | |||||
1819 | # mark all clean largefiles as dirty, just in case the update gets |
|
1819 | # mark all clean largefiles as dirty, just in case the update gets | |
1820 | # interrupted before largefiles and lfdirstate are synchronized |
|
1820 | # interrupted before largefiles and lfdirstate are synchronized | |
1821 | for lfile in oldclean: |
|
1821 | for lfile in oldclean: | |
1822 |
lfdirstate. |
|
1822 | entry = lfdirstate.get_entry(lfile) | |
|
1823 | lfdirstate.hacky_extension_update_file( | |||
|
1824 | lfile, | |||
|
1825 | wc_tracked=entry.tracked, | |||
|
1826 | p1_tracked=entry.p1_tracked, | |||
|
1827 | p2_info=entry.p2_info, | |||
|
1828 | possibly_dirty=True, | |||
|
1829 | ) | |||
1823 | lfdirstate.write(repo.currenttransaction()) |
|
1830 | lfdirstate.write(repo.currenttransaction()) | |
1824 |
|
1831 | |||
1825 | oldstandins = lfutil.getstandinsstate(repo) |
|
1832 | oldstandins = lfutil.getstandinsstate(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now