[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: Tue, 10 Nov 2009 19:38:01 +0100

On Tue, Nov 10, 2009 at 06:12:52PM +0000, Julian Foad wrote:
> 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.
>
> Please can you fix svn_wc__cd_to_cd2() in the same way at the same time.
>
> In the implementation, it looks like the code is identical for case
> svn_wc_conflict_kind_text and case svn_wc_conflict_kind_property, so
> please can you share it rather than duplicating it.

Fixed

/Daniel

Received on 2009-11-10 19:38:24 CET

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