[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix failing three-way diff for properties

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Mon, 9 Nov 2009 20:41:19 +0100

On Sat, Nov 07, 2009 at 08:07:45PM +1100, Gavin Baumanis wrote:
> Hi,
>
> Ping. This patch submission has received no further comments / updates.
>
> Gavin.
 
> > Daniel Näslund wrote:
> > [[[
> > Fix failing three way diff for properties when invoking diff-full (df)
> > in the interactive conflict resolutioner.
> >
> > * subversion/libsvn_wc/util.c
> > (svn_wc__cd2_to_cd): All the usual files needed in a three way diff is
> > available for properties as well as markers for binary format and
> > mime.
> >
> > * subversion/svn/conflict-callbacks.c
> > (svn_cl__conflict_handler): Set diff_allowed only if desc->is_binary
> > is false.
> > ]]]

[...]

That patch didn't properly determine if a property was binary or not. It
checked if the file the property was set on was binary. I will submit a
new patch later. Discard this one.

/Daniel

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2415882
Received on 2009-11-09 20:41:48 CET

This is an archived mail posted to the Subversion Dev mailing list.