On Feb 14, 2008 6:38 PM, <glasser_at_tigris.org> wrote:
> Author: glasser
> Date: Thu Feb 14 18:38:24 2008
> New Revision: 29374
>
> Log:
> Merge the mergeinfo-api-cleanup branch to trunk.
>
> Major changes:
>
> * Add typedefs of svn_mergeinfo_t and svn_mergeinfo_catalog_t for
> (apr_hash_t *); use them in many places, and remove redundant
> documentation of these types.
>
> * svn_[repos_]fs_get_mergeinfo now return parsed mergeinfo (like
> svn_ra_get_mergeinfo).
>
> * A bug where the include_descendants argument to svn_fs_get_mergeinfo
> was essentially ignored is fixed.
>
> * The routines to stringify mergeinfo and rangelists now make
> svn_string_t, not svn_stringbuf_t.
>
> * The unused API svn_range_compact is removed.
>
> * I left in two TODO(miapi) notes about APIs that I think should be
> removed (because they imply that it's ever OK to have unsorted
> rangelists).
>
>
> Modified:
> trunk/ (props changed)
> trunk/subversion/include/private/svn_mergeinfo_private.h
> trunk/subversion/include/svn_client.h
> trunk/subversion/include/svn_fs.h
> trunk/subversion/include/svn_mergeinfo.h
> trunk/subversion/include/svn_ra.h
> trunk/subversion/include/svn_repos.h
> trunk/subversion/libsvn_client/copy.c
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_client/merge.c
> trunk/subversion/libsvn_client/mergeinfo.c
> trunk/subversion/libsvn_client/mergeinfo.h
> trunk/subversion/libsvn_fs/fs-loader.c
> trunk/subversion/libsvn_fs/fs-loader.h
> trunk/subversion/libsvn_fs_base/tree.c
> trunk/subversion/libsvn_fs_fs/tree.c
> trunk/subversion/libsvn_ra/ra_loader.c
> trunk/subversion/libsvn_ra/ra_loader.h
> trunk/subversion/libsvn_ra_local/ra_plugin.c
> trunk/subversion/libsvn_ra_neon/mergeinfo.c
> trunk/subversion/libsvn_ra_serf/mergeinfo.c
> trunk/subversion/libsvn_ra_svn/client.c
> trunk/subversion/libsvn_repos/fs-wrap.c
> trunk/subversion/libsvn_repos/load.c
> trunk/subversion/libsvn_repos/log.c
> trunk/subversion/libsvn_repos/rev_hunt.c
> trunk/subversion/libsvn_subr/mergeinfo.c
> trunk/subversion/libsvn_wc/props.c
> trunk/subversion/mod_dav_svn/reports/mergeinfo.c
> trunk/subversion/svn/mergeinfo-cmd.c
> trunk/subversion/svndumpfilter/main.c
> trunk/subversion/svnserve/serve.c
> trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
>
Hi kou,
This commit caused five failures in the Ruby bindings tests. The first two
are simply due to the renamings from *_mergeinfo_to_stringbuf to
*_mergeinfo_to_string. See attached patch.
The other three failures are around the svn_(fs|ra|repos)_get_mergeinfo
changes. I tried adding
apr_hash_t **catalog,
to the "apply"s in core.i and while that quieted the "Warning(900): FIXME:
Missing argout typemap" from SWIG, running the fs test causes a segfault and
the others fail.
Would you please look at this?
Thanks,
--
Joe
PS: It seems like core.i should be updated to use the new typedef'd
svn_mergeinfo_t and svn_mergeinfo_catalog_t?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-02-18 18:15:25 CET