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

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

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Wed, 11 Nov 2009 19:48:20 +0100

On Wed, Nov 11, 2009 at 06:53:52PM +0100, Daniel Nslund wrote:
>
> [[[
> Fix failing three way diff for properties when invoking diff-full (df)
> in the interactive conflict resolver.
>
> * subversion/libsvn_wc/util.c
> (svn_wc__cd2_to_cd, svn_wc__cd_to_cd2): All the usual files needed
> in a three way diff is made available for properties as well as
> markers for binary format and mime.
>
> Patch by: Daniel Nslund <daniel{_AT_}longitudo.com>
> Suggested by: julianf
> ]]]

Double doh, forgot to update cd2_to_cd(). Fixed.

Received on 2009-11-11 19:48:46 CET

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