author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Fri, 08 Jun 2007 23:49:12 -0300 | |
changeset 4526 | cbabc9ac7424 |
parent 4525 | 78b6add1f966 |
child 4527 | b422b558015b |
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -507,8 +507,8 @@ def docopy(ui, repo, pats, opts, wlock): 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'):