Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Sat, 3 May 2008, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Sat, 3 May 2008, Tim Harper wrote:
> >
> >> -			printf("%s: needs update\n", ce->name);
> >> +			printf("%s: has changes\n", ce->name);
> >
> > How about "local changes"?
> 
> Aren't there Porcelain and end-user scripts that relies on the output by
> doing "sed -ne s'/: needs update$//p"?

Potentially.  But I thought that it would make more sense to use 
--name-only in that case.

However, I obviously like that you go out of your way to cause the least 
damage to current users, so how about something like in merge-recursive, 
where you can change some output based on an environment variable?

In this case, I'd rather make it an option, but that may be overkill.  But 
then, enough people have commented that this message is irritating them.

Ciao,
Dscho