[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: Tue, 10 Nov 2009 21:02:59 +0000

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.

- Julian

> On Tue, Nov 10, 2009 at 07:38:01PM +0100, Daniel Näslund wrote:
> > On Tue, Nov 10, 2009 at 06:12:52PM +0000, Julian Foad wrote:
> > > 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.
> > >
> > > 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
>
> > Index: subversion/libsvn_wc/util.c
> > ===================================================================
> > --- subversion/libsvn_wc/util.c (revision 40442)
> > +++ subversion/libsvn_wc/util.c (arbetskopia)
> > @@ -527,7 +527,7 @@
> > case svn_wc_conflict_kind_property:
> > new_conflict->property_name = apr_pstrdup(result_pool,
> > conflict->property_name);
> > - break;
> > + /* Falling through. */
> >
> > case svn_wc_conflict_kind_text:
> > new_conflict->is_binary = conflict->is_binary;
> > @@ -585,7 +585,7 @@
> > case svn_wc_conflict_kind_property:
> > new_conflict->property_name = apr_pstrdup(result_pool,
> > conflict->property_name);
> > - break;
> > + /* Falling through. */
> >
> > case svn_wc_conflict_kind_text:
> > new_conflict->is_binary = conflict->is_binary;
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2416274

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2416281
Received on 2009-11-10 22:03:14 CET

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