equal
deleted
inserted
replaced
420 (reltarget, repo.pathto(abssrc, cwd), |
420 (reltarget, repo.pathto(abssrc, cwd), |
421 repo.pathto(prevsrc, cwd))) |
421 repo.pathto(prevsrc, cwd))) |
422 return |
422 return |
423 |
423 |
424 # check for overwrites |
424 # check for overwrites |
425 exists = os.path.exists(target) |
425 exists = os.path.lexists(target) |
426 if not after and exists or after and state in 'mn': |
426 if not after and exists or after and state in 'mn': |
427 if not opts['force']: |
427 if not opts['force']: |
428 ui.warn(_('%s: not overwriting - file exists\n') % |
428 ui.warn(_('%s: not overwriting - file exists\n') % |
429 reltarget) |
429 reltarget) |
430 return |
430 return |