Re: [RFC PATCH] revert: Implement --abort processing

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 2, 2011, 16:41 UTC
Message-ID: <7vboygdw3d.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTikgY_Kc6gu_iTtpiiayo9e=DPxOLw@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

Show 7 quoted lines

> I see now that this probably doesn't fit everyone's usecase. So the
> changes I propose are:
> 1. Don't rerere clear. We can probably document this fact somewhere,
> and hint the user about this during the time of abort.
> 2. Use reset --merge as Sverre suggested.
>
> I'll think about this workflow and post a patch soon.

Please do the former but I would advice you not to do the latter.

If you do not clear rerere then you are not serving the original audience you wanted to serve, and if you do, you are hurting people when they do want to keep rerere. You cannot win either way.

The users are better off being exposed to "reset --merge" than kept unaware of the concepts necessary to do what they want hidden behind "revert --abort" that has fuzzy semantics that restores some but not all, with the definition of "some" being something we happened to decide here, which can never match what the user in every situation would want.