mercurial/merge.py
changeset 34037 65ae54582713
parent 33808 055fee3547df
child 34122 c0ce60459d84
equal deleted inserted replaced
34036:fe04c018eaac 34037:65ae54582713
  1148                     if repo.wvfs.isfileorlink(f):
  1148                     if repo.wvfs.isfileorlink(f):
  1149                         util.rename(absf, orig)
  1149                         util.rename(absf, orig)
  1150                 except OSError as e:
  1150                 except OSError as e:
  1151                     if e.errno != errno.ENOENT:
  1151                     if e.errno != errno.ENOENT:
  1152                         raise
  1152                         raise
  1153 
  1153             wctx[f].clearunknown()
  1154             if repo.wvfs.isdir(f) and not repo.wvfs.islink(f):
       
  1155                 repo.wvfs.removedirs(f)
       
  1156             wctx[f].write(fctx(f).data(), flags, backgroundclose=True)
  1154             wctx[f].write(fctx(f).data(), flags, backgroundclose=True)
  1157             if i == 100:
  1155             if i == 100:
  1158                 yield i, f
  1156                 yield i, f
  1159                 i = 0
  1157                 i = 0
  1160             i += 1
  1158             i += 1