You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@wandisco.com> on 2011/07/13 12:40:57 UTC

Re: svn commit: r1145901 - /subversion/trunk/subversion/libsvn_ra_serf/update.c

ivan@apache.org writes:

> Author: ivan
> Date: Wed Jul 13 08:07:53 2011
> New Revision: 1145901
>
> URL: http://svn.apache.org/viewvc?rev=1145901&view=rev
> Log:
> * subversion/libsvn_ra_serf/update.c
>   (end_report): Simplify condition a bit.
>
> Modified:
>     subversion/trunk/subversion/libsvn_ra_serf/update.c
>
> Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1145901&r1=1145900&r2=1145901&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
> +++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed Jul 13 08:07:53 2011
> @@ -1910,13 +1910,12 @@ end_report(svn_ra_serf__xml_parser_t *pa
>                                            svn_path_uri_encode(repos_relpath,
>                                                                info->pool));
>          }
> -
> -      /* Still no base URL?  If we have a WC, we might be able to dive all
> -       * the way into the WC to get the previous URL so we can do a
> -       * differential GET with the base URL.
> -       */
> -      if ((! info->delta_base) && (ctx->sess->wc_callbacks->get_wc_prop))
> +      else if (ctx->sess->wc_callbacks->get_wc_prop)
>          {
> +          /* If we have a WC, we might be able to dive all the way into the WC
> +           * to get the previous URL so we can do a differential GET with the
> +           * base URL.
> +           */
>            const svn_string_t *value = NULL;
>            SVN_ERR(ctx->sess->wc_callbacks->get_wc_prop(
>              ctx->sess->wc_callback_baton, info->name,

This appears to cause the windows buildbot to fail

http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/2747

but it doesn't affect my Linux build.

-- 
Philip

Re: svn commit: r1145901 - /subversion/trunk/subversion/libsvn_ra_serf/update.c

Posted by Ivan Zhakov <iv...@visualsvn.com>.
On Wed, Jul 13, 2011 at 14:40, Philip Martin <ph...@wandisco.com> wrote:
> ivan@apache.org writes:
>
>> Author: ivan
>> Date: Wed Jul 13 08:07:53 2011
>> New Revision: 1145901
>>
>> URL: http://svn.apache.org/viewvc?rev=1145901&view=rev
>> Log:
>> * subversion/libsvn_ra_serf/update.c
>>   (end_report): Simplify condition a bit.
>>
>> Modified:
>>     subversion/trunk/subversion/libsvn_ra_serf/update.c
>>
>> Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1145901&r1=1145900&r2=1145901&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
>> +++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed Jul 13 08:07:53 2011
>> @@ -1910,13 +1910,12 @@ end_report(svn_ra_serf__xml_parser_t *pa
>>                                            svn_path_uri_encode(repos_relpath,
>>                                                                info->pool));
>>          }
>> -
>> -      /* Still no base URL?  If we have a WC, we might be able to dive all
>> -       * the way into the WC to get the previous URL so we can do a
>> -       * differential GET with the base URL.
>> -       */
>> -      if ((! info->delta_base) && (ctx->sess->wc_callbacks->get_wc_prop))
>> +      else if (ctx->sess->wc_callbacks->get_wc_prop)
>>          {
>> +          /* If we have a WC, we might be able to dive all the way into the WC
>> +           * to get the previous URL so we can do a differential GET with the
>> +           * base URL.
>> +           */
>>            const svn_string_t *value = NULL;
>>            SVN_ERR(ctx->sess->wc_callbacks->get_wc_prop(
>>              ctx->sess->wc_callback_baton, info->name,
>
> This appears to cause the windows buildbot to fail
>
> http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/2747
>
> but it doesn't affect my Linux build.
>
That's strange, because tests are passing on my box. I'm currently
investigating issue.


-- 
Ivan Zhakov