[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: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 11 Nov 2009 00:39:01 +0100

On Tue, Nov 10, 2009 at 09:02:59PM +0000, Julian Foad wrote:
> On Tue, 2009-11-10 at 20:50 +0100, Daniel Näslund wrote:
> > Forgot again! Make check passed.
> Great. We tend to assume that "make check" passed whenever you post a
> patch, so please continue to remember to run the check.
> One more question: Are you sure the fields you are duplicating are not
> allowed to be NULL? If they are, then I think the apr_pstrdup() is not
> guaranteed to succeed and so you would have to do "thing ?
> apr_pstrdup(...) : NULL" or similar.
> I haven't looked for the answer, I'm just asking you.

Just a note:

Quick testing shows that the patch does what it should,
a proper diff is printed when choosing 'df' (diff-full)
during interactive conflict resolution on a property conflict.

And I'd also like to know the answer to Julian's question :)


Received on 2009-11-11 00:39:16 CET

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