From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 08 Mar 2008 17:51:48 GMT
Subject: Re: [PATCH] fix recursive-merge of empty files with different permissions
Message-ID: <alpine.LSU.1.00.0803081850470.3975@racer.site>
In-Reply-To: <20080308171726.GA16129@localhost>

Hi,

On Sat, 8 Mar 2008, Clemens Buchacher wrote:

> I do not understand why, but this does not happen if the file 
> permissions are the same.

I think this is the biggest problem.

>  t/t6031-merge-recursive.sh |   23 +++++++++++++++++++++++
>  xdiff/xmerge.c             |   30 ++++++++++++++----------------

... because xdiff/xmerge.c is definitely the wrong place to "fix" this 
issue.  xdl_merge() does not even _know_ about permissions.

Ciao,
Dscho