From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 08 Jan 2010 23:20:23 GMT
Subject: Re: [PATCH 9/9] rerere forget path: forget recorded resolution
Message-ID: <7vpr5krxoo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201001082255.51499.j6t@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> Your implementation forgets to re-insert the forgotten resolutions into
> MERGE_RR, therefore, the next 'git rerere' does not record the new
> resolution.
>
> In my implementation of 'rerere forget', I had the following tests.

Please filfre to roll a patch that adds the tests and code that inserts
necessary MERGE_RR entries, if the feature is pressing; unfortunately I
don't think I will have much git time during the coming weekend.