Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 4526 cbabc9ac7424
parent 4525 78b6add1f966
child 4542 af02e6078d08 
--- 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'):
Mercurial