Show More
@@ -507,8 +507,8 b' def docopy(ui, repo, pats, opts, wlock):' | |||||
507 | target = repo.wjoin(abstarget) |
|
507 | target = repo.wjoin(abstarget) | |
508 | if prevsrc is not None: |
|
508 | if prevsrc is not None: | |
509 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
509 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
510 |
(reltarget, |
|
510 | (reltarget, repo.pathto(abssrc, cwd), | |
511 |
|
|
511 | repo.pathto(prevsrc, cwd))) | |
512 | return |
|
512 | return | |
513 | if (not opts['after'] and os.path.exists(target) or |
|
513 | if (not opts['after'] and os.path.exists(target) or | |
514 | opts['after'] and repo.dirstate.state(abstarget) not in '?ar'): |
|
514 | opts['after'] and repo.dirstate.state(abstarget) not in '?ar'): |
General Comments 0
You need to be logged in to leave comments.
Login now