Show More
@@ -363,7 +363,7 b' def updatedir(ui, repo, patches, similar' | |||||
363 | islink, isexec = gp.mode |
|
363 | islink, isexec = gp.mode | |
364 | dst = repo.wjoin(gp.path) |
|
364 | dst = repo.wjoin(gp.path) | |
365 | # patch won't create empty files |
|
365 | # patch won't create empty files | |
366 | if gp.op == 'ADD' and not os.path.exists(dst): |
|
366 | if gp.op == 'ADD' and not os.path.lexists(dst): | |
367 | flags = (isexec and 'x' or '') + (islink and 'l' or '') |
|
367 | flags = (isexec and 'x' or '') + (islink and 'l' or '') | |
368 | repo.wwrite(gp.path, '', flags) |
|
368 | repo.wwrite(gp.path, '', flags) | |
369 | util.set_flags(dst, islink, isexec) |
|
369 | util.set_flags(dst, islink, isexec) | |
@@ -521,7 +521,7 b' def copy(ui, repo, pats, opts, rename=Fa' | |||||
521 | score = 0 |
|
521 | score = 0 | |
522 | for s in srcs: |
|
522 | for s in srcs: | |
523 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
523 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) | |
524 | if os.path.exists(t): |
|
524 | if os.path.lexists(t): | |
525 | score += 1 |
|
525 | score += 1 | |
526 | return score |
|
526 | return score | |
527 |
|
527 |
General Comments 0
You need to be logged in to leave comments.
Login now