[issue556] misleading error message 'untracked local file differs from remote version'

[Sascha Wilde]

New submission from Sascha Wilde <wilde at intevation.de>:

When a file in the repository already exists untracked in the working directory
hg up fails with the message:

abort: untracked local file 'foo' differs from remote version

This is hard to understand if you don't know what the problem is and to some
extend plain wrong, as this isn't a matter of "local" versus "remote" but of
working directory vs. repository.

I'd suggest to replace it by something along the lines of:

abort: untracked file 'foo' in working directory differs from requested target
revision

or a bit shorter:

abort: untracked file 'foo' differs from file 'foo' in target revision

----------
assignedto: ThomasAH
messages: 3058
nosy: ThomasAH, wilde
priority: feature
status: unread
title: misleading error message 'untracked local file differs from remote version'
topic: surprise, ui

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue556>
____________________________________________________