[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: Fri, 30 Oct 2009 08:50:42 +0100

On Thu, Oct 29, 2009 at 11:50:56PM +0100, 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.
> ]]]

[...]
>
> I haven't run make check yet. Will do it first thing tomorrow.

 make check passed!

Still having some doubts about the way I set diff_allowed in
svn_cl__conflict_handler(). It affects text conflicts too.

/Daniel

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2412950
Received on 2009-10-30 08:51:05 CET

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