##// END OF EJS Templates
merge: don't unnecessarily calculate backup path...
Martin von Zweigbergk -
r41710:ef229565 default
parent child Browse files
Show More
@@ -1505,8 +1505,8 b' def batchget(repo, mctx, wctx, actions):'
1505 if repo.wvfs.isfileorlink(p):
1505 if repo.wvfs.isfileorlink(p):
1506 absf = repo.wjoin(p)
1506 absf = repo.wjoin(p)
1507 break
1507 break
1508 orig = scmutil.origpath(ui, repo, absf)
1509 if repo.wvfs.lexists(absf):
1508 if repo.wvfs.lexists(absf):
1509 orig = scmutil.origpath(ui, repo, absf)
1510 util.rename(absf, orig)
1510 util.rename(absf, orig)
1511 wctx[f].clearunknown()
1511 wctx[f].clearunknown()
1512 atomictemp = ui.configbool("experimental", "update.atomic-file")
1512 atomictemp = ui.configbool("experimental", "update.atomic-file")
General Comments 0
You need to be logged in to leave comments. Login now