##// END OF EJS Templates
largefile: use `set_possibly_dirty` instead of `normallookup`...
marmoute -
r48521:d46d3aef default
parent child Browse files
Show More
@@ -1785,7 +1785,9 b' def mergeupdate(orig, repo, node, branch'
1785 # mark all clean largefiles as dirty, just in case the update gets
1785 # mark all clean largefiles as dirty, just in case the update gets
1786 # interrupted before largefiles and lfdirstate are synchronized
1786 # interrupted before largefiles and lfdirstate are synchronized
1787 for lfile in oldclean:
1787 for lfile in oldclean:
1788 lfdirstate.normallookup(lfile)
1788 entry = lfdirstate._map.get(lfile)
1789 assert not (entry.merged_removed or entry.from_p2_removed)
1790 lfdirstate.set_possibly_dirty(lfile)
1789 lfdirstate.write()
1791 lfdirstate.write()
1790
1792
1791 oldstandins = lfutil.getstandinsstate(repo)
1793 oldstandins = lfutil.getstandinsstate(repo)
General Comments 0
You need to be logged in to leave comments. Login now