From: Johan Herland <johan@herland.net>
Date: Fri, 18 Feb 2011 15:17:55 GMT
Subject: Re: Directory replaced with a file confuses cherry-pick
Message-ID: <201102181617.55929.johan@herland.net>
In-Reply-To: <op.vq3sr8w956e9f9@xman.eng.oslo.osa>

(please don't cull the CC list when replying)

On Friday 18 February 2011, Alexey Feldgendler wrote:
> On Fri, 18 Feb 2011 15:44:05 +0100, Johan Herland <johan@herland.net>
> 
> wrote:
> > Unable to reproduce. Here are the commands I used (please post yours):
> I tried your exact script now, line by line, and it failed in the way I
> described.
> 
> > This should not be the case. Which Git version are you using?
> 
> git is from Debian testing, package version 1:1.7.2.3-2.2.

I'm going away for the weekend, so I can't investigate this right now. Could 
you please retry with a more recent Git? Maybe someone else already knows 
which patch might have fixed this issue?


Have fun! :)

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net