Re: [PATCH 01/13] advice: Introduce error_resolve_conflict

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 2, 2011, 10:09 UTC
Message-ID: <20110702100951.GC19090@elie>
In-Reply-To: <BANLkTik2A7K84dbeL5XkaGv8nbske=EmCA@mail.gmail.com>

Ramkumar Ramachandra wrote:

> Jonathan Nieder writes:

Show 5 quoted lines

>> Notice that after writing the above, a little detail jumps out:
>> namely, the second "error:" line is giving advice, so it might make
>> sense to make it say "hint:" instead.
>
> How do I do this correctly?

In an ideal world, it would involve two patches.

 1. first, restructure the code without changing output
 2. then, change output

Or:

 1. first, change output without restructuring the code
 2. then, restructure the code

That way, readers could evaluate the merits of steps (1) and (2) separately.

Oh, you mean how to write a "hint:" line analagous to "error:" lines? There's no standard API for that yet but there's an example in builtin/revert.c (see v1.7.3-rc0~26^2~3, Introduce advise() to print hints, 2010-08-11).