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

Re: svn commit: r30467 - trunk/subversion/libsvn_client

From: Paul Burba <ptburba_at_gmail.com>
Date: Thu, 10 Apr 2008 15:25:43 -0400

On Thu, Apr 10, 2008 at 1:48 PM, Kamesh Jayachandran <kamesh_at_collab.net> wrote:
> >>
> >> Paul
> >Kamesh,
> >I'll take care of this (I forget sometimes how late it is for you!)
> >Paul
> Thanks Paul!


I committed this change in r30503...

...Then I realized that not only did r30503 have a bug (if all
mergeinfo was filtered then it put the original mergeinfo back in the
prop array!) but that the only reason we needed it regarding empty
mergeinfo was because of *another* bug:

      /* If this property isn't mergeinfo or is empty mergeinfo it
         does not require any special handling. */
      if ((strcmp(prop->name, SVN_PROP_MERGEINFO) != 0)
          || (! prop->value))
          APR_ARRAY_PUSH(adjusted_props, svn_prop_t) = *prop;

If PROP represents empty mergeinfo there is still a value (the empty
string) this should be:

      if ((strcmp(prop->name, SVN_PROP_MERGEINFO) != 0)
          || (! prop->value->len))

Fixed that in r30510. I'll remove r30503 from 1.5.x STATUS and put r30510 in.

Apologies to you and cmpilato for time wasted on this.


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-10 21:25:55 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.