Mercurial > hg-stable

changeset 4526:cbabc9ac7424

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docopy: use repo.pathto to format paths for printing
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 08 Jun 2007 23:49:12 -0300
parents 78b6add1f966
children b422b558015b
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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'):