This is good, but I was also talking about the header: it doesn't have SVN_DEPRECATED for these functions. Thus, the use of svn_rangelist_inheritable in that old implementation of svn_mergeinfo_inheritable did not show up.
On Thu, Mar 11, 2010 at 06:51, <julianf...@apache.org> wrote: > Author: julianfoad > Date: Thu Mar 11 11:51:52 2010 > New Revision: 921810 > > URL: http://svn.apache.org/viewvc?rev=921810&view=rev > Log: > Move two deprecated functions to 'deprecated.c'. > > * subversion/libsvn_subr/deprecated.c > (svn_mergeinfo_inheritable, svn_rangelist_inheritable): Move from ... > > * subversion/libsvn_subr/mergeinfo.c > (svn_mergeinfo_inheritable, svn_rangelist_inheritable): ... here. > > Modified: > subversion/trunk/subversion/libsvn_subr/deprecated.c > subversion/trunk/subversion/libsvn_subr/mergeinfo.c > > Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=921810&r1=921809&r2=921810&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_subr/deprecated.c (original) > +++ subversion/trunk/subversion/libsvn_subr/deprecated.c Thu Mar 11 11:51:52 > 2010 > @@ -38,6 +38,7 @@ > #include "svn_cmdline.h" > #include "svn_pools.h" > #include "svn_dso.h" > +#include "svn_mergeinfo.h" > > #include "opt.h" > #include "private/svn_opt_private.h" > @@ -886,3 +887,30 @@ svn_path_is_canonical(const char *path, > svn_dirent_is_canonical(path, pool) || > svn_relpath_is_canonical(path, pool); > } > + > + > +/*** From mergeinfo.c ***/ > + > +svn_error_t * > +svn_mergeinfo_inheritable(svn_mergeinfo_t *output, > + svn_mergeinfo_t mergeinfo, > + const char *path, > + svn_revnum_t start, > + svn_revnum_t end, > + apr_pool_t *pool) > +{ > + return svn_mergeinfo_inheritable2(output, mergeinfo, path, start, end, > + TRUE, pool, pool); > +} > + > +svn_error_t * > +svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist, > + apr_array_header_t *rangelist, > + svn_revnum_t start, > + svn_revnum_t end, > + apr_pool_t *pool) > +{ > + return svn_rangelist_inheritable2(inheritable_rangelist, rangelist, > + start, end, TRUE, pool, pool); > +} > + > > Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=921810&r1=921809&r2=921810&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original) > +++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Thu Mar 11 11:51:52 > 2010 > @@ -1534,18 +1534,6 @@ svn_mergeinfo_inheritable2(svn_mergeinfo > return SVN_NO_ERROR; > } > > -svn_error_t * > -svn_mergeinfo_inheritable(svn_mergeinfo_t *output, > - svn_mergeinfo_t mergeinfo, > - const char *path, > - svn_revnum_t start, > - svn_revnum_t end, > - apr_pool_t *pool) > -{ > - return svn_mergeinfo_inheritable2(output, mergeinfo, path, start, end, > - TRUE, pool, pool); > -} > - > > svn_error_t * > svn_rangelist_inheritable2(apr_array_header_t **inheritable_rangelist, > @@ -1600,17 +1588,6 @@ svn_rangelist_inheritable2(apr_array_hea > return SVN_NO_ERROR; > } > > -svn_error_t * > -svn_rangelist_inheritable(apr_array_header_t **inheritable_rangelist, > - apr_array_header_t *rangelist, > - svn_revnum_t start, > - svn_revnum_t end, > - apr_pool_t *pool) > -{ > - return svn_rangelist_inheritable2(inheritable_rangelist, rangelist, > - start, end, TRUE, pool, pool); > -} > - > svn_boolean_t > svn_mergeinfo__remove_empty_rangelists(svn_mergeinfo_t mergeinfo, > apr_pool_t *pool) > > >
