[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 30 Oct 2009 16:39:28 +0000

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.
> ]]]
> It turned out that when creating svn_wc__cd2_to_cd someone forgot that
> we now have the ability to do three way diffs for properties.
> I changed the condition for when a diff is allowed in the conflict
> handler but I wonder... If no mime-type is set is_binary is set to false
> for properties. But how do I set a mime-type for a property? This may be
> a bit too simple.

On this point, does the "is_binary" flag refer to a property or to the
versioned file's content? From what you say here, it sounds like it
refers to the versioned file's content. In that case, you cannot use it
to decide whether a property value is diffable. I think we have an API
for empirically determining whether a certain file or a certain text
contains non-text characters. It is used for automatically detecting
"binary" files during import/add. Maybe you could use it.

- Julian

Received on 2009-10-30 17:39:44 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.