diff options
Diffstat (limited to 'devel/subversion/files/extra-patch-enhanced-keyword')
| -rw-r--r-- | devel/subversion/files/extra-patch-enhanced-keyword | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/devel/subversion/files/extra-patch-enhanced-keyword b/devel/subversion/files/extra-patch-enhanced-keyword index 0d21f02e69ff..f76404f9af27 100644 --- a/devel/subversion/files/extra-patch-enhanced-keyword +++ b/devel/subversion/files/extra-patch-enhanced-keyword @@ -1,23 +1,22 @@ -diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h ---- subversion/include/svn_subst.h 2011-05-12 21:30:02.000000000 +0400 -+++ subversion/include/svn_subst.h 2011-09-07 21:47:19.000000000 +0400 -@@ -127,16 +127,31 @@ - * Set @a *kw to a new keywords hash filled with the appropriate contents - * given a @a keywords_string (the contents of the svn:keywords - * property for the file in question), the revision @a rev, the @a url, -- * the @a date the file was committed on, and the @a author of the last -- * commit. Any of these can be @c NULL to indicate that the information is -- * not present, or @c 0 for @a date. +diff -ruN subversion/include/private/svn_string_private.h subversion/include/private/svn_string_private.h +--- subversion/include/private/svn_string_private.h 2012-02-24 11:21:04.000000000 +0400 ++++ subversion/include/private/svn_string_private.h 2012-04-01 22:27:28.000000000 +0400 +@@ -35,6 +35,31 @@ + #endif /* __cplusplus */ + + /** ++ * Set @a *kw to a new keywords hash filled with the appropriate contents ++ * given a @a keywords_string (the contents of the svn:keywords ++ * property for the file in question), the revision @a rev, the @a url, + * the url of the root of the @a repos, the @a date the file was committed + * on, and the @a author of the last commit. Any of these can be @c NULL + * to indicate that the information is not present, or @c 0 for @a date. - * - * Hash keys are of type <tt>const char *</tt>. - * Hash values are of type <tt>svn_string_t *</tt>. - * - * All memory is allocated out of @a pool. - * -- * @since New in 1.3. ++ * ++ * Hash keys are of type <tt>const char *</tt>. ++ * Hash values are of type <tt>svn_string_t *</tt>. ++ * ++ * All memory is allocated out of @a pool. ++ * + * @since New in 1.6 + */ +svn_error_t * @@ -30,16 +29,13 @@ diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h + const char *author, + apr_pool_t *pool); + -+/** Similar to svn_subst_build_keywords3() except that it does not -+ * supply the repository location. -+ * -+ * @deprecated Provided for backward compatibility with the 1.3 API. ++/** + * @defgroup svn_string String handling + * @{ */ - svn_error_t * - svn_subst_build_keywords2(apr_hash_t **kw, diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c --- subversion/libsvn_client/cat.c 2011-08-18 18:05:35.000000000 +0400 -+++ subversion/libsvn_client/cat.c 2011-09-07 21:47:19.000000000 +0400 ++++ subversion/libsvn_client/cat.c 2012-04-01 22:24:38.000000000 +0400 @@ -137,12 +137,15 @@ const char *rev_str; const char *author; @@ -98,8 +94,8 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c cmt_author ? cmt_author->data : NULL, pool)); diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c ---- subversion/libsvn_client/commit.c 2011-08-17 18:01:10.000000000 +0400 -+++ subversion/libsvn_client/commit.c 2011-09-07 21:47:19.000000000 +0400 +--- subversion/libsvn_client/commit.c 2011-11-28 21:04:12.000000000 +0400 ++++ subversion/libsvn_client/commit.c 2012-04-01 22:24:38.000000000 +0400 @@ -126,9 +126,9 @@ } @@ -113,8 +109,8 @@ diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c keywords = NULL; diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c ---- subversion/libsvn_client/export.c 2011-06-24 12:09:09.000000000 +0400 -+++ subversion/libsvn_client/export.c 2011-09-07 21:47:19.000000000 +0400 +--- subversion/libsvn_client/export.c 2012-02-10 08:00:30.000000000 +0400 ++++ subversion/libsvn_client/export.c 2012-04-01 22:24:38.000000000 +0400 @@ -274,6 +274,7 @@ svn_revnum_t changed_rev; const char *suffix; @@ -168,7 +164,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c SVN_ERR(svn_subst_copy_and_translate4(fb->tmppath, fb->path, diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c --- subversion/libsvn_subr/subst.c 2011-07-29 21:28:11.000000000 +0400 -+++ subversion/libsvn_subr/subst.c 2011-09-07 21:47:19.000000000 +0400 ++++ subversion/libsvn_subr/subst.c 2012-04-01 22:24:38.000000000 +0400 @@ -135,8 +135,11 @@ * %b basename of the URL of this file * %d short format of date of this revision @@ -344,7 +340,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c APR_HASH_KEY_STRING, header_val); diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c --- subversion/libsvn_wc/translate.c 2011-07-07 15:29:08.000000000 +0400 -+++ subversion/libsvn_wc/translate.c 2011-09-07 21:47:19.000000000 +0400 ++++ subversion/libsvn_wc/translate.c 2012-04-01 22:24:38.000000000 +0400 @@ -313,10 +313,10 @@ apr_time_t changed_date; const char *changed_author; |