equal
deleted
inserted
replaced
376 (reltarget, repo.pathto(abssrc, cwd), |
376 (reltarget, repo.pathto(abssrc, cwd), |
377 repo.pathto(prevsrc, cwd))) |
377 repo.pathto(prevsrc, cwd))) |
378 return |
378 return |
379 |
379 |
380 # check for overwrites |
380 # check for overwrites |
381 exists = os.path.exists(target) |
381 exists = os.path.lexists(target) |
382 if not after and exists or after and state in 'mn': |
382 if not after and exists or after and state in 'mn': |
383 if not opts['force']: |
383 if not opts['force']: |
384 ui.warn(_('%s: not overwriting - file exists\n') % |
384 ui.warn(_('%s: not overwriting - file exists\n') % |
385 reltarget) |
385 reltarget) |
386 return |
386 return |