hgext/largefiles/overrides.py
changeset 48063 e4c79a1a0b67
parent 47754 4d845260a713
child 48106 82e142b9ad18
equal deleted inserted replaced
48062:46d1b75648f4 48063:e4c79a1a0b67
  1785                 continue
  1785                 continue
  1786             lfutil.updatestandin(repo, lfile, fstandin)
  1786             lfutil.updatestandin(repo, lfile, fstandin)
  1787         # mark all clean largefiles as dirty, just in case the update gets
  1787         # mark all clean largefiles as dirty, just in case the update gets
  1788         # interrupted before largefiles and lfdirstate are synchronized
  1788         # interrupted before largefiles and lfdirstate are synchronized
  1789         for lfile in oldclean:
  1789         for lfile in oldclean:
  1790             entry = lfdirstate._map.get(lfile)
       
  1791             assert not (entry.merged_removed or entry.from_p2_removed)
       
  1792             lfdirstate.set_possibly_dirty(lfile)
  1790             lfdirstate.set_possibly_dirty(lfile)
  1793         lfdirstate.write()
  1791         lfdirstate.write()
  1794 
  1792 
  1795         oldstandins = lfutil.getstandinsstate(repo)
  1793         oldstandins = lfutil.getstandinsstate(repo)
  1796         wc = kwargs.get('wc')
  1794         wc = kwargs.get('wc')