Re: cherry-pick fail when a symbolic link has been changed into a file or directory

From: Christian Couder <christian.couder@gmail.com>
Date: Nov 5, 2010, 08:34 UTC
Message-ID: <AANLkTi=aGHvQhG3bOcqS-U04UjFeB7PVw9GTsSuf3UFA@mail.gmail.com>
In-Reply-To: <AANLkTimDWM69qvY5wdyzFu=g6htg12-K542PRR4bdDYq@mail.gmail.com>

On Fri, Nov 5, 2010 at 5:54 AM, Elijah Newren <newren@gmail.com> wrote:

Show 16 quoted lines

> Hi,
>
> Sorry, I've been missing in action for about a month, but I'll have
> some time this weekend to catch back up on git stuff...
>
> On Thu, Nov 4, 2010 at 11:15 AM, Camille Moncelier
> <moncelier@devlife.org> wrote:
>> On Thu, 4 Nov 2010 18:03:39 +0100
>> Christian Couder <christian.couder@gmail.com> wrote:
>>> Elijah Newren sent a patch series around September the 20th but I did
>>> not check to see if this series was merged into pu, next or master.
>>> And I don't know if it fixes your problem.
>>> Could you have a look?
>> I think I already took a look last week, and I think they were merged
>> in 1.7.1 or 1.7.2 although I'm not sure. I'll take another look. This
>> evening or maybe tomorrow.

Great!

Show 7 quoted lines

> The patch series I posted in late September post-dates the related
> series of mine that were merged in 1.7.3.
>
> I'd also be happy to take a look and see if my newer merge-recursive
> series fixes your case (or whether one of my other improvements to
> that series since my September posting does).  If not, I'll track it
> down and fix it and add that fix to the series.

Great!

Thanks both, Christian.