From: Tim Harper <timcharper@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: 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.
Date: Sat, 3 May 2008 14:10:48 -0600 [thread overview]
Message-ID: <3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com> (raw)
In-Reply-To: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org>
I ran all of the tests with the patch apply, and they all pass. Is
that enough indication?
Tim
On May 3, 2008, at 10:57 AM, 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"?
>
next prev parent reply other threads:[~2008-05-03 20:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-03 7:08 [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 Tim Harper
2008-05-03 14:09 ` Johannes Schindelin
2008-05-03 16:19 ` Tim Harper
2008-05-03 16:57 ` Junio C Hamano
2008-05-03 20:10 ` Tim Harper [this message]
2008-05-04 0:08 ` Junio C Hamano
2008-05-04 0:21 ` Avery Pennarun
2008-05-04 1:24 ` Junio C Hamano
2008-05-05 16:35 ` Avery Pennarun
2008-05-05 17:05 ` Jeff King
2008-05-06 21:50 ` Tim Harper
2008-05-04 9:29 ` Johannes Schindelin
2008-05-03 15:24 ` Matt Graham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com \
--to=timcharper@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).