[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 11 Nov 2009 19:16:06 +0000

Daniel Näslund wrote:
> On Wed, Nov 11, 2009 at 06:53:52PM +0100, Daniel Näslund 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 Näslund <daniel{_AT_}longitudo.com>
> > Suggested by: julianf
> > ]]]
>
> Double doh, forgot to update cd2_to_cd(). Fixed.

Committed revision 40469. I took the liberty of editing the log message.

Thanks!
- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2416704
Received on 2009-11-11 20:16:27 CET

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