You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/30 16:12:54 UTC
svn commit: r1307434 [1/6] - in /subversion/branches/revprop-packing: ./
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_fs_fs/ subversion/libsvn_ra_serf/
subversion/libsvn_ra_svn/ subversion/libsvn_repos/ su...
Author: danielsh
Date: Fri Mar 30 14:12:52 2012
New Revision: 1307434
URL: http://svn.apache.org/viewvc?rev=1307434&view=rev
Log:
On the revprop-packing branch, sync with trunk@r1306300.
Modified:
subversion/branches/revprop-packing/ (props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_cache.h
subversion/branches/revprop-packing/subversion/include/svn_delta.h
subversion/branches/revprop-packing/subversion/include/svn_diff.h
subversion/branches/revprop-packing/subversion/include/svn_sorts.h
subversion/branches/revprop-packing/subversion/libsvn_client/client.h
subversion/branches/revprop-packing/subversion/libsvn_client/merge.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/dag.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/dag.h
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/tree.c
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/tree.h
subversion/branches/revprop-packing/subversion/libsvn_ra_serf/sb_bucket.c
subversion/branches/revprop-packing/subversion/libsvn_ra_serf/util.c
subversion/branches/revprop-packing/subversion/libsvn_ra_svn/client.c
subversion/branches/revprop-packing/subversion/libsvn_repos/dump.c
subversion/branches/revprop-packing/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/revprop-packing/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/revprop-packing/subversion/libsvn_subr/cache-memcache.c
subversion/branches/revprop-packing/subversion/libsvn_subr/spillbuf.c
subversion/branches/revprop-packing/subversion/libsvn_wc/wc_db.c
subversion/branches/revprop-packing/subversion/po/fr.po
subversion/branches/revprop-packing/subversion/svnserve/serve.c
subversion/branches/revprop-packing/subversion/tests/cmdline/log_tests.py
subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py
subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/revprop-packing/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/revprop-packing/subversion/tests/libsvn_subr/spillbuf-test.c
subversion/branches/revprop-packing/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/revprop-packing/tools/dev/unix-build/Makefile.svn
subversion/branches/revprop-packing/tools/dist/dist.sh
subversion/branches/revprop-packing/tools/dist/make-deps-tarball.sh (contents, props changed)
subversion/branches/revprop-packing/tools/dist/release.py
Propchange: subversion/branches/revprop-packing/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1304609-1306300
Merged /subversion/branches/node_pool:r1304828-1305388
Modified: subversion/branches/revprop-packing/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/include/private/svn_cache.h?rev=1307434&r1=1307433&r2=1307434&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/include/private/svn_cache.h (original)
+++ subversion/branches/revprop-packing/subversion/include/private/svn_cache.h Fri Mar 30 14:12:52 2012
@@ -55,7 +55,7 @@ extern "C" {
* i.e. modify @a data directly and return it in @a *out.
*/
typedef svn_error_t *(*svn_cache__deserialize_func_t)(void **out,
- char *data,
+ void *data,
apr_size_t data_len,
apr_pool_t *result_pool);
@@ -67,7 +67,7 @@ typedef svn_error_t *(*svn_cache__deseri
* not require the whole structure to be processed.
*/
typedef svn_error_t *(*svn_cache__partial_getter_func_t)(void **out,
- const char *data,
+ const void *data,
apr_size_t data_len,
void *baton,
apr_pool_t *result_pool);
@@ -80,7 +80,7 @@ typedef svn_error_t *(*svn_cache__partia
* values must be passed back in @a *data_len and @a *data, respectively.
* Allocations will be done from @a result_pool.
*/
-typedef svn_error_t *(*svn_cache__partial_setter_func_t)(char **data,
+typedef svn_error_t *(*svn_cache__partial_setter_func_t)(void **data,
apr_size_t *data_len,
void *baton,
apr_pool_t *result_pool);
@@ -90,7 +90,7 @@ typedef svn_error_t *(*svn_cache__partia
* function should allocate the serialized value in @a result_pool, set
* @a *data to the serialized value, and set @a *data_len to its length.
*/
-typedef svn_error_t *(*svn_cache__serialize_func_t)(char **data,
+typedef svn_error_t *(*svn_cache__serialize_func_t)(void **data,
apr_size_t *data_len,
void *in,
apr_pool_t *result_pool);
Modified: subversion/branches/revprop-packing/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/include/svn_delta.h?rev=1307434&r1=1307433&r2=1307434&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/include/svn_delta.h (original)
+++ subversion/branches/revprop-packing/subversion/include/svn_delta.h Fri Mar 30 14:12:52 2012
@@ -1292,6 +1292,8 @@ typedef svn_error_t *(*svn_delta_path_dr
* Use @a revision as the revision number passed to intermediate
* directory openings.
*
+ * Each path in @a paths is a const char *.
+ *
* Use @a pool for all necessary allocations.
*/
svn_error_t *
Modified: subversion/branches/revprop-packing/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/include/svn_diff.h?rev=1307434&r1=1307433&r2=1307434&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/include/svn_diff.h (original)
+++ subversion/branches/revprop-packing/subversion/include/svn_diff.h Fri Mar 30 14:12:52 2012
@@ -1045,7 +1045,7 @@ typedef struct svn_patch_t {
const char *new_filename;
/**
- * An array containing an svn_diff_hunk_t object for each hunk parsed
+ * An array containing an svn_diff_hunk_t * for each hunk parsed
* from the patch. */
apr_array_header_t *hunks;
Modified: subversion/branches/revprop-packing/subversion/include/svn_sorts.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/include/svn_sorts.h?rev=1307434&r1=1307433&r2=1307434&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/include/svn_sorts.h (original)
+++ subversion/branches/revprop-packing/subversion/include/svn_sorts.h Fri Mar 30 14:12:52 2012
@@ -112,9 +112,9 @@ svn_sort_compare_revisions(const void *a
/**
- * Compare two @c const char * paths, returning an integer greater
- * than, equal to, or less than 0, using the same comparison rules as
- * are used by svn_path_compare_paths().
+ * Compare two @c const char * paths, @a *a and @a *b, returning an
+ * integer greater than, equal to, or less than 0, using the same
+ * comparison rules as are used by svn_path_compare_paths().
*
* This function is compatible for use with qsort().
*
@@ -125,13 +125,13 @@ svn_sort_compare_paths(const void *a,
const void *b);
/**
- * Compare two @c svn_merge_range_t *'s, returning an integer greater
- * than, equal to, or less than 0 if the first range is greater than,
- * equal to, or less than, the second range.
+ * Compare two @c svn_merge_range_t *'s, @a *a and @a *b, returning an
+ * integer greater than, equal to, or less than 0 if the first range is
+ * greater than, equal to, or less than, the second range.
*
* Both @c svn_merge_range_t *'s must describe forward merge ranges.
*
- * If @a a and @a b intersect then the range with the lower start revision
+ * If @a *a and @a *b intersect then the range with the lower start revision
* is considered the lesser range. If the ranges' start revisions are
* equal then the range with the lower end revision is considered the
* lesser range.
Modified: subversion/branches/revprop-packing/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/libsvn_client/client.h?rev=1307434&r1=1307433&r2=1307434&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/libsvn_client/client.h (original)
+++ subversion/branches/revprop-packing/subversion/libsvn_client/client.h Fri Mar 30 14:12:52 2012
@@ -842,7 +842,7 @@ svn_client__get_copy_committables(svn_cl
apr_pool_t *scratch_pool);
/* A qsort()-compatible sort routine for sorting an array of
- svn_client_commit_item_t's by their URL member. */
+ svn_client_commit_item_t *'s by their URL member. */
int svn_client__sort_commit_item_urls(const void *a, const void *b);