From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 27 Jul 2009 14:09:56 GMT
Subject: Re: What's cooking in git.git (Jul 2009, #02; Sun, 26)
Message-ID: <81b0412b0907270709kd6a5b8fy51829099d7b488e5@mail.gmail.com>
In-Reply-To: <7viqhfrfu5.fsf@alter.siamese.dyndns.org>

On Sun, Jul 26, 2009 at 10:47, Junio C Hamano<gitster@pobox.com> wrote:
> * ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits
>  - Fix for a merge where a branch has an F->D transition
>  - Add a reminder test case for a merge with F/D transition
>
> Although the reported breakage is covered with the patch, Alex feels the
> solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive
> may be long overdue but seems to be a hard problem.

Maybe promote the testcase patch to master and drop (or leave it in
next) the other patch?
So that the reminder reminds not only people running next but also anyone who
happens to look at the output of their test suite run.