equal
deleted
inserted
replaced
538 shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig)) |
538 shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig)) |
539 wvfs.unlinkpath(standinorig) |
539 wvfs.unlinkpath(standinorig) |
540 expecthash = lfutil.readasstandin(wctx[standin]) |
540 expecthash = lfutil.readasstandin(wctx[standin]) |
541 if expecthash != b'': |
541 if expecthash != b'': |
542 if lfile not in wctx: # not switched to normal file |
542 if lfile not in wctx: # not switched to normal file |
543 if repo.dirstate[standin] != b'?': |
543 if repo.dirstate.get_entry(standin).any_tracked: |
544 wvfs.unlinkpath(lfile, ignoremissing=True) |
544 wvfs.unlinkpath(lfile, ignoremissing=True) |
545 else: |
545 else: |
546 dropped.add(lfile) |
546 dropped.add(lfile) |
547 |
547 |
548 # use normallookup() to allocate an entry in largefiles |
548 # use normallookup() to allocate an entry in largefiles |