--- a/mercurial/commands.py Fri Jun 08 23:49:12 2007 -0300
+++ b/mercurial/commands.py Fri Jun 08 23:49:12 2007 -0300
@@ -507,8 +507,8 @@
target = repo.wjoin(abstarget)
if prevsrc is not None:
ui.warn(_('%s: not overwriting - %s collides with %s\n') %
- (reltarget, util.localpath(abssrc),
- util.localpath(prevsrc)))
+ (reltarget, repo.pathto(abssrc, cwd),
+ repo.pathto(prevsrc, cwd)))
return
if (not opts['after'] and os.path.exists(target) or
opts['after'] and repo.dirstate.state(abstarget) not in '?ar'):