equal
deleted
inserted
replaced
1504 for p in util.finddirs(f): |
1504 for p in util.finddirs(f): |
1505 if repo.wvfs.isfileorlink(p): |
1505 if repo.wvfs.isfileorlink(p): |
1506 conflicting = p |
1506 conflicting = p |
1507 break |
1507 break |
1508 if repo.wvfs.lexists(conflicting): |
1508 if repo.wvfs.lexists(conflicting): |
1509 absf = repo.wjoin(conflicting) |
1509 orig = scmutil.backuppath(ui, repo, conflicting) |
1510 orig = scmutil.origpath(ui, repo, absf) |
1510 util.rename(repo.wjoin(conflicting), orig) |
1511 util.rename(absf, orig) |
|
1512 wctx[f].clearunknown() |
1511 wctx[f].clearunknown() |
1513 atomictemp = ui.configbool("experimental", "update.atomic-file") |
1512 atomictemp = ui.configbool("experimental", "update.atomic-file") |
1514 wctx[f].write(fctx(f).data(), flags, backgroundclose=True, |
1513 wctx[f].write(fctx(f).data(), flags, backgroundclose=True, |
1515 atomictemp=atomictemp) |
1514 atomictemp=atomictemp) |
1516 if i == 100: |
1515 if i == 100: |