You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Price <mi...@acm.org> on 2003/05/13 04:36:16 UTC

subversion/libsvn_ra_dav/util.c in release branch

The signature for svn_ra_dav__parsed_request is different in the 0.22.2 release 
branch and HEAD. So the recent merge of trunk revision 5888 isn't correct. Would 
someone wise in the ways of ra_dav foo make the appropriate changes to the 
release branch (or let me know what the appropriate changes are)?

Thanks.

Michael


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: subversion/libsvn_ra_dav/util.c in release branch

Posted by cm...@collab.net.
Offering a free peer review here.  Brane's patch, applied to the
branch with 5888 merged into it, should produce the desired results.

Another way to do this is just to also merge in the 5857 bugfixes, in
which the signature for svn_ra_dav__parsed_request() changed.  But
with a minor release coming shortly, I think I'd go without 5857, and
with Brane's patch.

=?UTF-8?B?QnJhbmtvIMSMaWJlag==?= <br...@xbc.nu> writes:

> With the following patch to libsvn_ra_dav/util.c, both ra_local and
> ra_dav tests pass on Windows. As far as I'm concerned, 0.22.2 is ready
> to roll.
> 
> 
> Index: subversion/libsvn_ra_dav/util.c
> ===================================================================
> --- subversion/libsvn_ra_dav/util.c     (revision 5903)
> +++ subversion/libsvn_ra_dav/util.c     (working copy)
> @@ -305,11 +305,6 @@
>    ne_xml_push_handler(success_parser, elements,
>                         validate_cb, startelm_cb, endelm_cb, baton);
> 
> -  /* if our caller is interested in having access to this parser, call
> -     the SET_PARSER callback with BATON. */
> -  if (set_parser != NULL)
> -    set_parser(success_parser, baton);
> -
>    /* create a parser to read the <D:error> response body */
>    error_parser = ne_xml_create();
>    ne_xml_push_handler(error_parser, error_elements, validate_error_elements,
> 
> 
> 
> -- 
> Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: subversion/libsvn_ra_dav/util.c in release branch

Posted by Branko Čibej <br...@xbc.nu>.
Branko Čibej wrote:

>Michael Price wrote:
>
>  
>
>>The signature for svn_ra_dav__parsed_request is different in the
>>0.22.2 release branch and HEAD. So the recent merge of trunk revision
>>5888 isn't correct. Would someone wise in the ways of ra_dav foo make
>>the appropriate changes to the release branch (or let me know what the
>>appropriate changes are)?
>>    
>>
>
>I suggest just dropping revision 5888 from the release, or reverting the
>change to libsvn_ra_dav/util.c from the release branch. 5888 was just
>warning fixes; sorry for the confusion...
>  
>
With the following patch to libsvn_ra_dav/util.c, both ra_local and
ra_dav tests pass on Windows. As far as I'm concerned, 0.22.2 is ready
to roll.


Index: subversion/libsvn_ra_dav/util.c
===================================================================
--- subversion/libsvn_ra_dav/util.c     (revision 5903)
+++ subversion/libsvn_ra_dav/util.c     (working copy)
@@ -305,11 +305,6 @@
   ne_xml_push_handler(success_parser, elements,
                        validate_cb, startelm_cb, endelm_cb, baton);

-  /* if our caller is interested in having access to this parser, call
-     the SET_PARSER callback with BATON. */
-  if (set_parser != NULL)
-    set_parser(success_parser, baton);
-
   /* create a parser to read the <D:error> response body */
   error_parser = ne_xml_create();
   ne_xml_push_handler(error_parser, error_elements, validate_error_elements,



-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: subversion/libsvn_ra_dav/util.c in release branch

Posted by Branko Čibej <br...@xbc.nu>.
Michael Price wrote:

> The signature for svn_ra_dav__parsed_request is different in the
> 0.22.2 release branch and HEAD. So the recent merge of trunk revision
> 5888 isn't correct. Would someone wise in the ways of ra_dav foo make
> the appropriate changes to the release branch (or let me know what the
> appropriate changes are)?

I suggest just dropping revision 5888 from the release, or reverting the
change to libsvn_ra_dav/util.c from the release branch. 5888 was just
warning fixes; sorry for the confusion...

-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org