Show More
@@ -1506,9 +1506,8 b' def batchget(repo, mctx, wctx, actions):' | |||
|
1506 | 1506 | conflicting = p |
|
1507 | 1507 | break |
|
1508 | 1508 | if repo.wvfs.lexists(conflicting): |
|
1509 |
|
|
|
1510 | orig = scmutil.origpath(ui, repo, absf) | |
|
1511 | util.rename(absf, orig) | |
|
1509 | orig = scmutil.backuppath(ui, repo, conflicting) | |
|
1510 | util.rename(repo.wjoin(conflicting), orig) | |
|
1512 | 1511 | wctx[f].clearunknown() |
|
1513 | 1512 | atomictemp = ui.configbool("experimental", "update.atomic-file") |
|
1514 | 1513 | wctx[f].write(fctx(f).data(), flags, backgroundclose=True, |
General Comments 0
You need to be logged in to leave comments.
Login now