mercurial/merge.py
branchstable
changeset 29629 b33c0c38d68f
parent 29480 1e4512eac59e
child 29774 a7f8939641aa
equal deleted inserted replaced
29628:6217180f9ab8 29629:b33c0c38d68f
  1080                         util.rename(absf, orig)
  1080                         util.rename(absf, orig)
  1081                 except OSError as e:
  1081                 except OSError as e:
  1082                     if e.errno != errno.ENOENT:
  1082                     if e.errno != errno.ENOENT:
  1083                         raise
  1083                         raise
  1084 
  1084 
  1085             if repo.wvfs.isdir(f):
  1085             if repo.wvfs.isdir(f) and not repo.wvfs.islink(f):
  1086                 repo.wvfs.removedirs(f)
  1086                 repo.wvfs.removedirs(f)
  1087             wwrite(f, fctx(f).data(), flags, backgroundclose=True)
  1087             wwrite(f, fctx(f).data(), flags, backgroundclose=True)
  1088             if i == 100:
  1088             if i == 100:
  1089                 yield i, f
  1089                 yield i, f
  1090                 i = 0
  1090                 i = 0