equal
deleted
inserted
replaced
505 prevsrc = targets.get(abstarget) |
505 prevsrc = targets.get(abstarget) |
506 src = repo.wjoin(abssrc) |
506 src = repo.wjoin(abssrc) |
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, util.localpath(abssrc), |
510 (reltarget, repo.pathto(abssrc, cwd), |
511 util.localpath(prevsrc))) |
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'): |
515 if not opts['force']: |
515 if not opts['force']: |
516 ui.warn(_('%s: not overwriting - file exists\n') % |
516 ui.warn(_('%s: not overwriting - file exists\n') % |