Re: svn commit: r24027 - in trunk: . build build/generator notes subversion/bindings/java/javahl/native subversion/bindings/swig subversion/bindings/swig/include subversion/bindings/swig/python/libsvn_swig_py subversion/include subversion/include/pri

Hi,

2007/3/23, dlr@tigris.org <dlr@tigris.org>:
> Author: dlr
> Date: Thu Mar 22 14:11:00 2007
> New Revision: 24027

> Log:
> Merge the merge-tracking branch to trunk.

Is MERGEHASHHASH really needed? I think we can use MERGEHASH
instead of it.

> Modified: trunk/subversion/bindings/swig/include/svn_types.swg
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/include/svn_types.swg?pathrev=24027&r1=24026&r2=24027
> ==============================================================================
> --- trunk/subversion/bindings/swig/include/svn_types.swg (original)
> +++ trunk/subversion/bindings/swig/include/svn_types.swg Thu Mar 22 14:11:00 2007
> @@ -363,6 +363,51 @@

> +#ifdef SWIGPYTHON
> +%typemap(argout) apr_hash_t **MERGEHASHHASH
> +{
> + $result = t_output_helper(
> + $result,
> + svn_swig_py_mergeinfo_hash_to_dict(*$1,
> + $descriptor(svn_merge_range_t *),
> + _global_py_pool));
> + if (PyErr_Occurred()) {
> + SWIG_fail;
> + }
> +}
> +#endif

> Modified: trunk/subversion/bindings/swig/svn_ra.i
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/svn_ra.i?pathrev=24027&r1=24026&r2=24027
> ==============================================================================
> --- trunk/subversion/bindings/swig/svn_ra.i (original)
> +++ trunk/subversion/bindings/swig/svn_ra.i Thu Mar 22 14:11:00 2007
> @@ -91,6 +91,8 @@
> svn_swig_rb_ra_lock_callback)
> #endif
>
> +%apply apr_hash_t **MERGEHASHHASH { apr_hash_t **mergeoutput };
> +
> /* ----------------------------------------------------------------------- */
>
> %include svn_ra_h.swg
>

Thanks,

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