svn commit: r1829295 - in /subversion/trunk/subversion: libsvn_client/shelf.c tests/cmdline/shelf_tests.py

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 16:35:09 2018
New Revision: 1829295

URL: http://svn.apache.org/viewvc?rev=1829295=rev
Log:
Shelving: start supporting binary files.

Use git diff binary literal format. This works for a stop-gap, but is
inefficient for large files.

* subversion/libsvn_client/shelf.c
  (is_binary_file): New.
  (walk_callback): Use git binary diff for binary files.

* subversion/tests/cmdline/shelf_tests.py
  (shelve_binary_file_mod,
   shelve_binary_file_add,
   shelve_binary_file_del): Remove 'XFail'.

Modified:
subversion/trunk/subversion/libsvn_client/shelf.c
subversion/trunk/subversion/tests/cmdline/shelf_tests.py

Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1829295=1829294=1829295=diff
==
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Mon Apr 16 16:35:09 2018
@@ -356,6 +356,34 @@ note_shelved(apr_array_header_t *shelved
   return SVN_NO_ERROR;
 }
 
+/* Set *IS_BINARY to true iff the pristine or working version of
+ * LOCAL_ABSPATH has a MIME-type that we regard as 'binary'.
+ */
+static svn_error_t *
+is_binary_file(svn_boolean_t *is_binary,
+   const char *local_abspath,
+   svn_client_ctx_t *ctx,
+   apr_pool_t *scratch_pool)
+{
+  apr_hash_t *props;
+  const svn_string_t *value;
+
+  SVN_ERR(svn_wc_get_pristine_props(, ctx->wc_ctx,
+local_abspath,
+scratch_pool, scratch_pool));
+  value = props ? svn_hash_gets(props, SVN_PROP_MIME_TYPE)
+: NULL;
+  *is_binary = value && svn_mime_type_is_binary(value->data);
+
+  SVN_ERR(svn_wc_prop_get2(, ctx->wc_ctx, local_abspath,
+   SVN_PROP_MIME_TYPE,
+   scratch_pool, scratch_pool));
+  if (value && svn_mime_type_is_binary(value->data))
+*is_binary = TRUE;
+
+  return SVN_NO_ERROR;
+}
+
 /* An implementation of svn_wc_status_func4_t. */
 static svn_error_t *
 walk_callback(void *baton,
@@ -386,30 +414,39 @@ walk_callback(void *baton,
   case svn_wc_status_deleted:
   case svn_wc_status_added:
   case svn_wc_status_replaced:
-SVN_ERR(svn_client_diff_peg7(
-NULL /*options*/,
-local_abspath,
-_revision,
-_revision,
-_revision,
-wb->wc_root_abspath,
-svn_depth_empty,
-TRUE /*notice_ancestry*/,
-FALSE /*no_diff_added*/,
-FALSE /*no_diff_deleted*/,
-TRUE /*show_copies_as_adds*/,
-FALSE /*ignore_content_type: FALSE -> omit binary files*/,
-FALSE /*ignore_properties*/,
-FALSE /*properties_only*/,
-FALSE /*use_git_diff_format*/,
-FALSE /*pretty_print_mergeinfo*/,
-SVN_APR_LOCALE_CHARSET,
-wb->outstream,
-wb->errstream,
-NULL /*changelists*/,
-wb->ctx, scratch_pool));
+  {
+svn_boolean_t binary = FALSE;
+if (status->kind == svn_node_file)
+  {
+SVN_ERR(is_binary_file(, local_abspath,
+   wb->ctx, scratch_pool));
+  }
+/* For binary files, use git diff binary literal format.
+   This works for a stop-gap, but is inefficient for large files. */
+SVN_ERR(svn_client_diff_peg7(NULL /*options*/,
+ local_abspath,
+ _revision,
+ _revision,
+ _revision,
+ wb->wc_root_abspath,
+ svn_depth_empty,
+ TRUE /*notice_ancestry*/,
+ FALSE /*no_diff_added*/,
+ FALSE /*no_diff_deleted*/,
+ TRUE /*show_copies_as_adds*/,
+ FALSE /*ignore_content_type: FALSE -> 
omit binary files*/,
+ FALSE /*ignore_properties*/,
+ FALSE /*properties_only*/,
+ binary /*use_git_diff_format*/,
+ FALSE /*pretty_print_mergeinfo*/,
+ SVN_APR_LOCALE_CHARSET,
+ wb->outstream,
+ wb->errstream,
+ NULL /*changelists*/,
+ wb->ctx, scratch_pool));
 wb->any_shelved = TRUE;
 break;
+  }
 
   

svn commit: r1829271 - /subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 13:19:15 2018
New Revision: 1829271

URL: http://svn.apache.org/viewvc?rev=1829271=rev
Log:
On the 'shelve-checkpoint' branch: resolve conflicts.

Modified:

subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c

Modified: 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c?rev=1829271=1829270=1829271=diff
==
--- 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c 
(original)
+++ 
subversion/branches/shelve-checkpoint/subversion/libsvn_client/prop_commands.c 
Mon Apr 16 13:19:15 2018
@@ -480,9 +480,9 @@ svn_client_revprop_set2(const char *prop
 {
   svn_client_shelf_t *shelf;
 
-  SVN_ERR(svn_client_shelf_open(, revision->value.shelf,
-URL, ctx, pool));
-  SVN_ERR(svn_client__shelf_revprop_set(shelf, propname, propval, pool));
+  SVN_ERR(svn_client_shelf_open_existing(, revision->value.shelf,
+ URL, ctx, pool));
+  SVN_ERR(svn_client_shelf_revprop_set(shelf, propname, propval, pool));
   SVN_ERR(svn_client_shelf_close(shelf, pool));
   *set_rev = SVN_INVALID_REVNUM;
   return SVN_NO_ERROR;
@@ -992,9 +992,9 @@ svn_client_revprop_get(const char *propn
 {
   svn_client_shelf_t *shelf;
 
-  SVN_ERR(svn_client_shelf_open(, revision->value.shelf,
-URL, ctx, pool));
-  SVN_ERR(svn_client__shelf_revprop_get(propval, shelf, propname, pool));
+  SVN_ERR(svn_client_shelf_open_existing(, revision->value.shelf,
+ URL, ctx, pool));
+  SVN_ERR(svn_client_shelf_revprop_get(propval, shelf, propname, pool));
   SVN_ERR(svn_client_shelf_close(shelf, pool));
   *set_rev = SVN_INVALID_REVNUM;
   return SVN_NO_ERROR;
@@ -1582,9 +1582,9 @@ svn_client_revprop_list(apr_hash_t **pro
 {
   svn_client_shelf_t *shelf;
 
-  SVN_ERR(svn_client_shelf_open(, revision->value.shelf,
-URL, ctx, pool));
-  SVN_ERR(svn_client__shelf_revprop_list(props, shelf, pool));
+  SVN_ERR(svn_client_shelf_open_existing(, revision->value.shelf,
+ URL, ctx, pool));
+  SVN_ERR(svn_client_shelf_revprop_list(props, shelf, pool));
   SVN_ERR(svn_client_shelf_close(shelf, pool));
   *set_rev = SVN_INVALID_REVNUM;
   return SVN_NO_ERROR;

svn commit: r1829275 - in /subversion/trunk: ./ notes/ notes/http-and-webdav/ notes/merge-tracking/ notes/obliterate/ notes/tree-conflicts/

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 13:57:44 2018
New Revision: 1829275

URL: http://svn.apache.org/viewvc?rev=1829275=rev
Log:
Update issue tracker links in notes, from Tigris (issuezilla) to Apache (Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

Modified:
subversion/trunk/CHANGES
subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt
subversion/trunk/notes/client-configuration
subversion/trunk/notes/diff-optimizations.txt
subversion/trunk/notes/http-and-webdav/webdav-protocol
subversion/trunk/notes/merge-tracking/func-spec.html
subversion/trunk/notes/merge-tracking/requirements.html
subversion/trunk/notes/merge-tracking/summit.html
subversion/trunk/notes/obliterate/obliterate-functional-spec.txt
subversion/trunk/notes/tree-conflicts/design-overview.txt
subversion/trunk/notes/tree-conflicts/detection.txt
subversion/trunk/notes/tree-conflicts/use-cases.txt

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1829275=1829274=1829275=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Mon Apr 16 13:57:44 2018
@@ -5725,7 +5725,7 @@ http://svn.apache.org/repos/asf/subversi
   twice as slow and lose all concurrent-client scalability.
 
   This is a temporary fix for a larger design problem.  See issue
-  http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+  https://issues.apache.org/jira/browse/SVN-1499
 
 
 Version 0.28.1

Modified: subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt?rev=1829275=1829274=1829275=diff
==
--- subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt (original)
+++ subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt Mon Apr 16 13:57:44 2018
@@ -151,7 +151,7 @@ Comments from projects that switched fro
 
 * The w.c. space penalty is a real issue for large projects.  Disk
   space is not as cheap as we thought, those .svn/text-base/* files
-  hurt.  See http://subversion.tigris.org/issues/show_bug.cgi?id=525.
+  hurt.  See https://issues.apache.org/jira/browse/SVN-525.
   
   [gerv: Random thought - if you can't easily do copy-on-write, could
   you perhaps share text-base files by hard-linking between multiple

Modified: subversion/trunk/notes/client-configuration
URL: 
http://svn.apache.org/viewvc/subversion/trunk/notes/client-configuration?rev=1829275=1829274=1829275=diff
==
--- subversion/trunk/notes/client-configuration (original)
+++ subversion/trunk/notes/client-configuration Mon Apr 16 13:57:44 2018
@@ -59,8 +59,8 @@ dev@s.a.o: "Bikeshed: configuration over
 dev@s.a.o: "Default commandline args";
 http://svn.haxx.se/dev/archive-2010-12/0449.shtml
 Issue 1974: "server-side config which 'broadcasts' to clients";
-http://subversion.tigris.org/issues/show_bug.cgi?id=1974
+https://issues.apache.org/jira/browse/SVN-1974
 Issue 3765: "client-configurable default args";
-http://subversion.tigris.org/issues/show_bug.cgi?id=3765
+https://issues.apache.org/jira/browse/SVN-3765
 Issue 3769: "Add APIs which allow library consumers to specify configuration 
options"
-http://subversion.tigris.org/issues/show_bug.cgi?id=3769
+https://issues.apache.org/jira/browse/SVN-3769

Modified: subversion/trunk/notes/diff-optimizations.txt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/notes/diff-optimizations.txt?rev=1829275=1829274=1829275=diff
==
--- subversion/trunk/notes/diff-optimizations.txt (original)
+++ subversion/trunk/notes/diff-optimizations.txt Mon Apr 16 13:57:44 2018
@@ -80,7 +80,7 @@ See also issue #1966 (libsvn_diff needs
 References
 --
 
-[1] http://subversion.tigris.org/issues/show_bug.cgi?id=1966 (libsvn_diff
+[1] https://issues.apache.org/jira/browse/SVN-1966 (libsvn_diff
 needs 'non-minimal-diff' mode)
 [2] Miller, W., and Myers, E.W. "A File Comparison Program.", Software -
 Practice & Experience 15 (1985), pp. 1025-1040.

Modified: subversion/trunk/notes/http-and-webdav/webdav-protocol
URL: 
http://svn.apache.org/viewvc/subversion/trunk/notes/http-and-webdav/webdav-protocol?rev=1829275=1829274=1829275=diff
==
--- subversion/trunk/notes/http-and-webdav/webdav-protocol (original)
+++ subversion/trunk/notes/http-and-webdav/webdav-protocol Mon Apr 16 13:57:44 
2018
@@ -425,7 +425,7 @@ Purpose: Retrieve a record of the change
 
 Target URL: Prior to Subversion 1.8, the target URL was the public
 resource URL of the aforementioned subtree.  Per issue #4287
-

svn commit: r1829257 [6/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/po/sv.po
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/po/sv.po?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/shelve-checkpoint/subversion/po/sv.po [UTF-8] Mon Apr 
16 12:21:02 2018
@@ -110,8 +110,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: d...@subversion.apache.org\n"
-"POT-Creation-Date: 2013-07-19 18:01+0200\n"
-"PO-Revision-Date: 2013-05-04 12:03+0200\n"
+"POT-Creation-Date: 2018-03-12 16:55+0100\n"
+"PO-Revision-Date: 2018-03-12 16:58+0100\n"
 "Last-Translator: Subversion Developers \n"
 "Language-Team: Swedish \n"
 "Language: sv\n"
@@ -123,72 +123,72 @@ msgstr ""
 #. Constructing nice error messages for roots.
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:81
+#: ../include/private/svn_fs_util.h:86
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "Filen finns inte: transaktion \"%s\", sökväg \"%s\""
 
-#: ../include/private/svn_fs_util.h:86
+#: ../include/private/svn_fs_util.h:91
 #, c-format
 msgid "File not found: revision %ld, path '%s'"
 msgstr "Filen finns inte: revision %ld, sökväg \"%s\""
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:97
+#: ../include/private/svn_fs_util.h:102
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "Filen finns redan: filsystem \"%s\", transaktion \"%s\", sökväg \"%s\""
 
-#: ../include/private/svn_fs_util.h:102
+#: ../include/private/svn_fs_util.h:107
 #, c-format
 msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
 msgstr "Filen finns redan: filsystem \"%s\", revision %ld, sökväg \"%s\""
 
 #. ROOT is of type svn_fs_root_t *.
-#: ../include/private/svn_fs_util.h:110
+#: ../include/private/svn_fs_util.h:115
 msgid "Root object must be a transaction root"
 msgstr "Rotobjektet måste vara en transaktionsrot"
 
 #. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
 #. outside of a transaction. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:117
+#: ../include/private/svn_fs_util.h:122
 #, c-format
 msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
 msgstr "Filen får ej ändras: filsystem \"%s\", revision %ld, sökväg \"%s\""
 
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:124
+#: ../include/private/svn_fs_util.h:129
 #, c-format
 msgid "'%s' is not a directory in filesystem '%s'"
 msgstr "\"%s\" är ingen katalog i filsystemet \"%s\""
 
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:131
+#: ../include/private/svn_fs_util.h:136
 #, c-format
 msgid "'%s' is not a file in filesystem '%s'"
 msgstr "\"%s\" är ingen fil i filsystemet \"%s\""
 
 #. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *".
-#: ../include/private/svn_fs_util.h:139
+#: ../include/private/svn_fs_util.h:144
 #, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "Sökvägen \"%s\" är redan låst av användaren \"%s\" i filsystemet 
\"%s\""
 
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:146
+#: ../include/private/svn_fs_util.h:151
 #, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "Inget lås på sökvägen \"%s\" i filsystemet \"%s\""
 
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:153
+#: ../include/private/svn_fs_util.h:158
 #, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "Låset har gått ut: låsidentifierare \"%s\" i filsystemet \"%s\""
 
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:160
+#: ../include/private/svn_fs_util.h:165
 #, c-format
 msgid "No username is currently associated with filesystem '%s'"
 msgstr "Inget användarnamn är kopplat till filsystemet \"%s\""
@@ -196,1237 +196,1437 @@ msgstr "Inget användarnamn är kopplat
 #. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
 #. LOCK_OWNER doesn't match the USERNAME associated with FS.
 #. FS is of type "svn_fs_t *".
-#: ../include/private/svn_fs_util.h:169
+#: ../include/private/svn_fs_util.h:174
 #, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
 msgstr "Användaren \"%s\" försöker använda ett lås som ägs av \"%s\" i 
filsystemet \"%s\""
 
-#: ../include/svn_error_codes.h:164
+#: ../include/svn_error_codes.h:166
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "Felaktig föräldrapool skickad till svn_make_pool()"
 
-#: ../include/svn_error_codes.h:168
+#: 

svn commit: r1829257 [8/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/svn/svn.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/svn.c?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svn/svn.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/svn.c Mon Apr 16 
12:21:02 2018
@@ -61,8 +61,6 @@
 #include "svn_private_config.h"
 
 
-/*#define WITH_SHELVE_V1*/
-
 /*** Option Processing ***/
 
 /* Add an identifier here for long options that don't have a short
@@ -148,11 +146,8 @@ typedef enum svn_cl__longopt_t {
   opt_show_item,
   opt_adds_as_modification,
   opt_vacuum_pristines,
-#ifdef WITH_SHELVE_V1
-  opt_delete,
-  opt_keep_shelved,
-  opt_list
-#endif
+  opt_drop,
+  opt_viewspec,
 } svn_cl__longopt_t;
 
 
@@ -464,7 +459,11 @@ const apr_getopt_option_t svn_cl__option
   " "
   "author of 'last-changed-revision'\n"
   " "
-  "   'wc-root'root of TARGET's working copy")},
+  "   'wc-root'root of TARGET's working copy\n"
+  " "
+  "   'schedule'   'normal','add','delete','replace'\n"
+  " "
+  "   'depth'  checkout depth of TARGET in WC")},
 
   {"adds-as-modification", opt_adds_as_modification, 0,
N_("Local additions are merged with incoming 
additions\n"
@@ -478,11 +477,11 @@ const apr_getopt_option_t svn_cl__option
   {"vacuum-pristines", opt_vacuum_pristines, 0,
N_("remove unreferenced pristines from .svn 
directory")},
 
-#ifdef WITH_SHELVE_V1
-  {"list", opt_list, 0, N_("list shelved patches")},
-  {"keep-shelved", opt_keep_shelved, 0, N_("do not delete the shelved patch")},
-  {"delete", opt_delete, 0, N_("delete the shelved patch")},
-#endif
+  {"drop", opt_drop, 0,
+   N_("drop shelf after successful unshelve")},
+
+  {"viewspec", opt_viewspec, 0,
+   N_("print the working copy layout")},
 
   /* Long-opt Aliases
*
@@ -529,92 +528,97 @@ const int svn_cl__global_options[] =
 opt_encoding, \
 opt_with_revprop
 
-const svn_opt_subcommand_desc2_t svn_cl__cmd_table[] =
+const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
 {
-  { "add", svn_cl__add, {0}, N_
-("Put files and directories under version control, scheduling\n"
+  { "add", svn_cl__add, {0}, {N_(
+ "Put files and directories under version control, scheduling\n"
  "them for addition to repository.  They will be added in next commit.\n"
- "usage: add PATH...\n"),
+ "usage: add PATH...\n"
+)},
 {opt_targets, 'N', opt_depth, 'q', opt_force, opt_no_ignore, opt_autoprops,
  opt_no_autoprops, opt_parents },
  {{opt_parents, N_("add intermediate parents")}} },
 
-  { "auth", svn_cl__auth, {0}, N_
-   ("Manage cached authentication credentials.\n"
-"usage: 1. svn auth [PATTERN ...]\n"
-"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n"
-"\n"
-"  With no arguments, list all cached authentication credentials.\n"
-"  Authentication credentials include usernames, passwords,\n"
-"  SSL certificates, and SSL client-certificate passphrases.\n"
-"  If PATTERN is specified, only list credentials with attributes matching 
one\n"
-"  or more patterns. With the --remove option, remove cached 
authentication\n"
-"  credentials matching one or more patterns.\n"
-"\n"
-"  If more than one pattern is specified credentials are considered only 
if they\n"
-"  match all specified patterns. Patterns are matched case-sensitively and 
may\n"
-"  contain glob wildcards:\n"
-"?  matches any single character\n"
-"*  matches a sequence of arbitrary characters\n"
-"[abc]  matches any of the characters listed inside the brackets\n"
-"  Note that wildcards will usually need to be quoted or escaped on the\n"
-"  command line because many command shells will interfere by trying to\n"
-"  expand them.\n"),
+  { "auth", svn_cl__auth, {0}, {N_(
+ "Manage cached authentication credentials.\n"
+ "usage: 1. svn auth [PATTERN ...]\n"
+ "usage: 2. svn auth --remove PATTERN [PATTERN ...]\n"
+ "\n"), N_(
+ "  With no arguments, list all cached authentication credentials.\n"
+ "  Authentication credentials include usernames, passwords,\n"
+ "  SSL certificates, and SSL client-certificate passphrases.\n"
+ "  If PATTERN is specified, only list credentials with attributes 
matching one\n"
+ "  or more patterns. With the --remove option, remove cached 

svn commit: r1829257 [1/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 12:21:02 2018
New Revision: 1829257

URL: http://svn.apache.org/viewvc?rev=1829257=rev
Log:
On the 'shelve-checkpoint' branch: catch up with trunk@1829253.

Added:

subversion/branches/shelve-checkpoint/subversion/bindings/swig/python/tests/fs.py
  - copied unchanged from r1829253, 
subversion/trunk/subversion/bindings/swig/python/tests/fs.py
subversion/branches/shelve-checkpoint/subversion/libsvn_client/layout.c
  - copied unchanged from r1829253, 
subversion/trunk/subversion/libsvn_client/layout.c
subversion/branches/shelve-checkpoint/subversion/tests/cmdline/dav_tests.py
  - copied unchanged from r1829253, 
subversion/trunk/subversion/tests/cmdline/dav_tests.py

subversion/branches/shelve-checkpoint/subversion/tests/libsvn_delta/svndiff-stream-test.c
  - copied unchanged from r1829253, 
subversion/trunk/subversion/tests/libsvn_delta/svndiff-stream-test.c
subversion/branches/shelve-checkpoint/tools/client-side/svnviewspec_test.py
  - copied unchanged from r1829253, 
subversion/trunk/tools/client-side/svnviewspec_test.py

subversion/branches/shelve-checkpoint/tools/dist/backport_tests_data/backport_logsummary_colon.dump
  - copied unchanged from r1829253, 
subversion/trunk/tools/dist/backport_tests_data/backport_logsummary_colon.dump
Removed:
subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
Modified:
subversion/branches/shelve-checkpoint/   (props changed)
subversion/branches/shelve-checkpoint/CHANGES
subversion/branches/shelve-checkpoint/COMMITTERS
subversion/branches/shelve-checkpoint/INSTALL
subversion/branches/shelve-checkpoint/Makefile.in
subversion/branches/shelve-checkpoint/build.conf
subversion/branches/shelve-checkpoint/build/PrintPath
subversion/branches/shelve-checkpoint/build/ac-macros/find_apr.m4
subversion/branches/shelve-checkpoint/build/ac-macros/find_apu.m4
subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4
subversion/branches/shelve-checkpoint/build/transform_sql.py
subversion/branches/shelve-checkpoint/configure.ac

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/native/SVNRepos.cpp

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/native/SVNRepos.h

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java

subversion/branches/shelve-checkpoint/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java

subversion/branches/shelve-checkpoint/subversion/bindings/swig/perl/native/Core.pm

subversion/branches/shelve-checkpoint/subversion/bindings/swig/python/svn/fs.py

subversion/branches/shelve-checkpoint/subversion/bindings/swig/python/tests/run_all.py

subversion/branches/shelve-checkpoint/subversion/include/private/svn_sorts_private.h

subversion/branches/shelve-checkpoint/subversion/include/private/svn_subr_private.h

subversion/branches/shelve-checkpoint/subversion/include/private/svn_wc_private.h
subversion/branches/shelve-checkpoint/subversion/include/svn_client.h
subversion/branches/shelve-checkpoint/subversion/include/svn_fs.h
subversion/branches/shelve-checkpoint/subversion/include/svn_opt.h
subversion/branches/shelve-checkpoint/subversion/include/svn_props.h
subversion/branches/shelve-checkpoint/subversion/include/svn_ra.h
subversion/branches/shelve-checkpoint/subversion/include/svn_ra_svn.h
subversion/branches/shelve-checkpoint/subversion/include/svn_repos.h
subversion/branches/shelve-checkpoint/subversion/libsvn_client/client.h
subversion/branches/shelve-checkpoint/subversion/libsvn_client/conflicts.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/diff.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/export.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/info.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/patch.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelf.c
subversion/branches/shelve-checkpoint/subversion/libsvn_client/update.c
subversion/branches/shelve-checkpoint/subversion/libsvn_delta/debug_editor.c
subversion/branches/shelve-checkpoint/subversion/libsvn_delta/svndiff.c
subversion/branches/shelve-checkpoint/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/shelve-checkpoint/subversion/libsvn_fs_fs/cached_data.h
subversion/branches/shelve-checkpoint/subversion/libsvn_fs_fs/dag.c
subversion/branches/shelve-checkpoint/subversion/libsvn_fs_fs/fs_fs.c

svn commit: r1829257 [7/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/svn/auth-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/auth-cmd.c?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svn/auth-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/auth-cmd.c Mon Apr 16 
12:21:02 2018
@@ -455,12 +455,15 @@ svn_cl__auth(apr_getopt_t *os, void *bat
 {
   if (b.patterns->nelts == 0)
 SVN_ERR(svn_cmdline_printf(pool,
-  _("Credentials cache in '%s' contains %d credentials\n"),
+  Q_("Credentials cache in '%s' contains %d credential\n",
+ "Credentials cache in '%s' contains %d credentials\n",
+ b.matches),
   svn_dirent_local_style(config_path, pool), b.matches));
   else
 SVN_ERR(svn_cmdline_printf(pool,
-  _("Credentials cache in '%s' contains %d matching "
-"credentials\n"),
+  Q_("Credentials cache in '%s' contains %d matching 
credential\n",
+ "Credentials cache in '%s' contains %d matching 
credentials\n",
+ b.matches),
   svn_dirent_local_style(config_path, pool), b.matches));
 }
 
@@ -474,9 +477,11 @@ svn_cl__auth(apr_getopt_t *os, void *bat
"no matching credentials"),
  svn_dirent_local_style(config_path, pool));
   else
-SVN_ERR(svn_cmdline_printf(pool, _("Deleted %d matching credentials "
-   "from '%s'\n"), b.matches,
-   svn_dirent_local_style(config_path, pool)));
+SVN_ERR(svn_cmdline_printf(pool,
+  Q_("Deleted %d matching credential from '%s'\n",
+ "Deleted %d matching credentials from '%s'\n",
+ b.matches),
+  b.matches, svn_dirent_local_style(config_path, pool)));
 }
 
   return SVN_NO_ERROR;

Modified: subversion/branches/shelve-checkpoint/subversion/svn/cl.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/cl.h?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svn/cl.h (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/cl.h Mon Apr 16 
12:21:02 2018
@@ -256,7 +256,8 @@ typedef struct svn_cl__opt_state_t
   const char *show_item;   /* print only the given item */
   svn_boolean_t adds_as_modification; /* update 'add vs add' no tree conflict 
*/
   svn_boolean_t vacuum_pristines; /* remove unreferenced pristines */
-  svn_boolean_t list;
+  svn_boolean_t drop; /* drop shelf after successful unshelve */
+  svn_boolean_t viewspec;
 } svn_cl__opt_state_t;
 
 /* Conflict stats for operations such as update and merge. */
@@ -307,13 +308,11 @@ svn_opt_subcommand_t
   svn_cl__shelf_diff,
   svn_cl__shelf_drop,
   svn_cl__shelf_list,
+  svn_cl__shelf_list_by_paths,
   svn_cl__shelf_log,
   svn_cl__shelf_save,
   svn_cl__shelf_shelve,
   svn_cl__shelf_unshelve,
-  svn_cl__shelve,
-  svn_cl__unshelve,
-  svn_cl__shelves,
   svn_cl__status,
   svn_cl__switch,
   svn_cl__unlock,
@@ -322,7 +321,7 @@ svn_opt_subcommand_t
 
 
 /* See definition in svn.c for documentation. */
-extern const svn_opt_subcommand_desc2_t svn_cl__cmd_table[];
+extern const svn_opt_subcommand_desc3_t svn_cl__cmd_table[];
 
 /* See definition in svn.c for documentation. */
 extern const int svn_cl__global_options[];

Modified: subversion/branches/shelve-checkpoint/subversion/svn/help-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/help-cmd.c?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svn/help-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/help-cmd.c Mon Apr 16 
12:21:02 2018
@@ -166,7 +166,7 @@ svn_cl__help(apr_getopt_t *os,
  pool);
 #endif
 }
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
   svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
 #endif
 #ifdef SVN_HAVE_GPG_AGENT
@@ -179,7 +179,7 @@ svn_cl__help(apr_getopt_t *os,
   svn_stringbuf_appendcstr(version_footer, "* KWallet (KDE)\n");
 #endif
 
-  return svn_opt_print_help4(os,
+  return svn_opt_print_help5(os,
  "svn",   /* ### erm, derive somehow? */
  opt_state ? opt_state->version : FALSE,
  opt_state ? opt_state->quiet : FALSE,

svn commit: r1829257 [11/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/binding

[julianfoad]

Modified: 
subversion/branches/shelve-checkpoint/tools/dev/unix-build/Makefile.svn
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/tools/dev/unix-build/Makefile.svn?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/tools/dev/unix-build/Makefile.svn 
(original)
+++ subversion/branches/shelve-checkpoint/tools/dev/unix-build/Makefile.svn Mon 
Apr 16 12:21:02 2018
@@ -171,7 +171,7 @@ FETCH_CMD   = wget -c
 SUBVERSION_REPOS_URL = https://svn.apache.org/repos/asf/subversion
 BDB_URL= http://download.oracle.com/berkeley-db/$(BDB_DIST)
 APR_URL= https://svn.apache.org/repos/asf/apr/apr
-APR_ICONV_URL  = https://www.apache.org/dist/apr/$(APR_ICONV_DIST)
+APR_ICONV_URL  = https://archive.apache.org/dist/apr/$(APR_ICONV_DIST)
 GNU_ICONV_URL  = https://ftp.gnu.org/pub/gnu/libiconv/$(GNU_ICONV_DIST)
 APR_UTIL_URL   = https://svn.apache.org/repos/asf/apr/apr-util
 HTTPD_URL  = https://archive.apache.org/dist/httpd/$(HTTPD_DIST)
@@ -240,6 +240,10 @@ endif
 # We need this to make sure some targets below pick up the right libraries
 
LD_LIBRARY_PATH=$(PREFIX)/apr/lib:$(PREFIX)/gettext/lib:$(PREFIX)/iconv/lib:$(PREFIX)/bdb/lib:$(PREFIX)/neon/lib:$(PREFIX)/serf/lib:$(PREFIX)/sqlite/lib:$(PREFIX)/cyrus-sasl/lib:$(PREFIX)/iconv/lib:$(PREFIX)/libmagic/lib:$(PREFIX)/ruby/lib:$(PREFIX)/python/lib:$(PREFIX)/svn-$(WC)/lib
 
+# We need this to make sure some targets below pick up the right pkg-config 
files
+PKG_CONFIG_PATH=$(PREFIX)/apr/lib/pkgconfig:$(PREFIX)/neon/lib/pkgconfig:$(PREFIX)/serf/lib/pkgconfig:$(PREFIX)/sqlite/lib/pkgconfig:$(PREFIX)/ruby/lib/pkgconfig:$(PREFIX)/python/lib/pkgconfig:$(PREFIX)/lz4/lib/pkgconfig
+
+
 ###
 # Main targets.
 ###
@@ -390,6 +394,7 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR)
cd $(APR_SRCDIR) && ./buildconf
cd $(APR_OBJDIR) \
&& env CFLAGS="-O0 -g $(PROFILE_CFLAGS)" GREP="`which grep`" \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(APR_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--enable-maintainer-mode \
@@ -439,6 +444,7 @@ $(APR_ICONV_OBJDIR)/.configured: $(APR_I
cd $(APR_ICONV_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
GREP="`which grep`" \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(APR_ICONV_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--with-apr=$(PREFIX)/apr
@@ -522,6 +528,7 @@ $(GNU_ICONV_OBJDIR)/.configured: $(GNU_I
${MAKE} -f Makefile.devel lib/aliases.h
cd $(GNU_ICONV_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(GNU_ICONV_SRCDIR)/configure \
--prefix=$(PREFIX)/iconv \
--enable-extra-encodings
@@ -592,6 +599,7 @@ $(APR_UTIL_OBJDIR)/.configured: $(APR_UT
cd $(APR_UTIL_SRCDIR) && ./buildconf --with-apr=$(APR_SRCDIR)
cd $(APR_UTIL_OBJDIR) \
&& env LD_LIBRARY_PATH=$(PREFIX)/bdb/lib \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
GREP="`which grep`" \
$(APR_UTIL_SRCDIR)/configure \
@@ -728,6 +736,7 @@ $(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJ
cd $(HTTPD_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
GREP="`which grep`" \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(HTTPD_SRCDIR)/configure \
--prefix=$(PREFIX)/httpd \
--enable-maintainer-mode \
@@ -812,6 +821,7 @@ $(NEON_OBJDIR)/.configured: $(NEON_OBJDI
fi
cd $(NEON_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(NEON_SRCDIR)/configure \
PATH=$(NEON_OBJDIR):$$PATH \
--prefix=$(PREFIX)/neon \
@@ -874,7 +884,8 @@ $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR)
CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
APR=$(PREFIX)/apr \
APU=$(PREFIX)/apr \
-   PREFIX=$(PREFIX)/serf
+   PREFIX=$(PREFIX)/serf \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
touch $@
 
 # install serf
@@ -966,6 +977,7 @@ endif
 $(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved
cd $(SQLITE_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
+   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \

svn commit: r1829257 [3/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: 
subversion/branches/shelve-checkpoint/subversion/libsvn_delta/debug_editor.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/libsvn_delta/debug_editor.c?rev=1829257=1829256=1829257=diff
==
--- 
subversion/branches/shelve-checkpoint/subversion/libsvn_delta/debug_editor.c 
(original)
+++ 
subversion/branches/shelve-checkpoint/subversion/libsvn_delta/debug_editor.c 
Mon Apr 16 12:21:02 2018
@@ -71,9 +71,11 @@ set_target_revision(void *edit_baton,
   SVN_ERR(svn_stream_printf(eb->out, pool, "set_target_revision : %ld\n",
 target_revision));
 
-  return eb->wrapped_editor->set_target_revision(eb->wrapped_edit_baton,
- target_revision,
- pool);
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->set_target_revision(eb->wrapped_edit_baton,
+target_revision,
+pool));
+  return SVN_NO_ERROR;
 }
 
 static svn_error_t *
@@ -90,10 +92,11 @@ open_root(void *edit_baton,
 base_revision));
   eb->indent_level++;
 
-  SVN_ERR(eb->wrapped_editor->open_root(eb->wrapped_edit_baton,
-base_revision,
-pool,
-_baton->wrapped_dir_baton));
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->open_root(eb->wrapped_edit_baton,
+  base_revision,
+  pool,
+  _baton->wrapped_dir_baton));
 
   dir_baton->edit_baton = edit_baton;
 
@@ -115,10 +118,12 @@ delete_entry(const char *path,
   SVN_ERR(svn_stream_printf(eb->out, pool, "delete_entry : %s:%ld\n",
 path, base_revision));
 
-  return eb->wrapped_editor->delete_entry(path,
-  base_revision,
-  pb->wrapped_dir_baton,
-  pool);
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->delete_entry(path,
+ base_revision,
+ pb->wrapped_dir_baton,
+ pool));
+  return SVN_NO_ERROR;
 }
 
 static svn_error_t *
@@ -139,12 +144,13 @@ add_directory(const char *path,
 path, copyfrom_path, copyfrom_revision));
   eb->indent_level++;
 
-  SVN_ERR(eb->wrapped_editor->add_directory(path,
-pb->wrapped_dir_baton,
-copyfrom_path,
-copyfrom_revision,
-pool,
->wrapped_dir_baton));
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->add_directory(path,
+  pb->wrapped_dir_baton,
+  copyfrom_path,
+  copyfrom_revision,
+  pool,
+  >wrapped_dir_baton));
 
   b->edit_baton = eb;
   *child_baton = b;
@@ -168,11 +174,12 @@ open_directory(const char *path,
 path, base_revision));
   eb->indent_level++;
 
-  SVN_ERR(eb->wrapped_editor->open_directory(path,
- pb->wrapped_dir_baton,
- base_revision,
- pool,
- >wrapped_dir_baton));
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->open_directory(path,
+   pb->wrapped_dir_baton,
+   base_revision,
+   pool,
+   >wrapped_dir_baton));
 
   db->edit_baton = eb;
   *child_baton = db;
@@ -199,12 +206,13 @@ add_file(const char *path,
 
   eb->indent_level++;
 
-  SVN_ERR(eb->wrapped_editor->add_file(path,
-   pb->wrapped_dir_baton,
-   copyfrom_path,
-   copyfrom_revision,
-   pool,
-   >wrapped_file_baton));
+  if (eb->wrapped_editor)
+SVN_ERR(eb->wrapped_editor->add_file(path,
+ pb->wrapped_dir_baton,
+ copyfrom_path,
+ 

svn commit: r1829291 - /subversion/trunk/subversion/libsvn_client/shelf.c

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 15:43:03 2018
New Revision: 1829291

URL: http://svn.apache.org/viewvc?rev=1829291=rev
Log:
Shelving: walk the WC ourself for paths to shelve.

Rather than letting 'diff' do the walking, this prepares for storing binary
files by some method other than diff. It also lets us report unshelvable
paths.

* subversion/libsvn_client/shelf.c
  (walk_baton_t, note_shelve, walk_callback, wc_walk_status_multi): New.
  (write_patch): Walk the WC ourselves. Report whether we shelved anything
and how many paths we could not shelve.
  (svn_client_shelf_save_new_version2): Error if not any paths could not
be shelved.

Modified:
subversion/trunk/subversion/libsvn_client/shelf.c

Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1829291=1829290=1829291=diff
==
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Mon Apr 16 15:43:03 2018
@@ -334,6 +334,149 @@ shelf_write_current(svn_client_shelf_t *
   return SVN_NO_ERROR;
 }
 
+/* A baton for use with walk_callback(). */
+typedef struct walk_baton_t {
+  apr_hash_t *changelist_hash;
+  const char *wc_root_abspath;
+  svn_stream_t *outstream;
+  svn_stream_t *errstream;
+  svn_client_ctx_t *ctx;
+  svn_boolean_t any_shelved;  /* were any paths successfully shelved? */
+  apr_array_header_t *unshelvable;  /* paths unshelvable */
+  apr_pool_t *pool;  /* pool for data in 'unshelvable', etc. */
+} walk_baton_t;
+
+/*  */
+static svn_error_t *
+note_shelved(apr_array_header_t *shelved,
+ const char *relpath,
+ apr_pool_t *pool)
+{
+  APR_ARRAY_PUSH(shelved, const char *) = apr_pstrdup(pool, relpath);
+  return SVN_NO_ERROR;
+}
+
+/* An implementation of svn_wc_status_func4_t. */
+static svn_error_t *
+walk_callback(void *baton,
+  const char *local_abspath,
+  const svn_wc_status3_t *status,
+  apr_pool_t *scratch_pool)
+{
+  walk_baton_t *wb = baton;
+  svn_opt_revision_t peg_revision = {svn_opt_revision_unspecified, {0}};
+  svn_opt_revision_t start_revision = {svn_opt_revision_base, {0}};
+  svn_opt_revision_t end_revision = {svn_opt_revision_working, {0}};
+  const char *wc_relpath = svn_dirent_skip_ancestor(wb->wc_root_abspath,
+local_abspath);
+
+  /* If the status item has an entry, but doesn't belong to one of the
+ changelists our caller is interested in, we filter out this status
+ transmission.  */
+  if (wb->changelist_hash
+  && (! status->changelist
+  || ! svn_hash_gets(wb->changelist_hash, status->changelist)))
+{
+  return SVN_NO_ERROR;
+}
+
+  switch (status->node_status)
+{
+  case svn_wc_status_modified:
+  case svn_wc_status_deleted:
+  case svn_wc_status_added:
+  case svn_wc_status_replaced:
+SVN_ERR(svn_client_diff_peg7(
+NULL /*options*/,
+local_abspath,
+_revision,
+_revision,
+_revision,
+wb->wc_root_abspath,
+svn_depth_empty,
+TRUE /*notice_ancestry*/,
+FALSE /*no_diff_added*/,
+FALSE /*no_diff_deleted*/,
+TRUE /*show_copies_as_adds*/,
+FALSE /*ignore_content_type: FALSE -> omit binary files*/,
+FALSE /*ignore_properties*/,
+FALSE /*properties_only*/,
+FALSE /*use_git_diff_format*/,
+FALSE /*pretty_print_mergeinfo*/,
+SVN_APR_LOCALE_CHARSET,
+wb->outstream,
+wb->errstream,
+NULL /*changelists*/,
+wb->ctx, scratch_pool));
+wb->any_shelved = TRUE;
+break;
+
+  case svn_wc_status_incomplete:
+if ((status->text_status != svn_wc_status_normal
+ && status->text_status != svn_wc_status_none)
+|| (status->prop_status != svn_wc_status_normal
+&& status->prop_status != svn_wc_status_none))
+  {
+/* Incomplete, but local modifications */
+SVN_ERR(note_shelved(wb->unshelvable, wc_relpath, wb->pool));
+  }
+break;
+
+  case svn_wc_status_conflicted:
+  case svn_wc_status_missing:
+  case svn_wc_status_obstructed:
+SVN_ERR(note_shelved(wb->unshelvable, wc_relpath, wb->pool));
+break;
+
+  case svn_wc_status_normal:
+  case svn_wc_status_ignored:
+  case svn_wc_status_none:
+  case svn_wc_status_external:
+  case svn_wc_status_unversioned:
+  default:
+break;
+}
+
+  return SVN_NO_ERROR;
+}
+
+/*
+ * Walk the tree rooted at PATHS, to depth DEPTH.
+ *
+ * PATHS are absolute, or relative to CWD.
+ */
+static 

svn commit: r1829294 - /subversion/branches/1.10.x/STATUS

[stsp]

Author: stsp
Date: Mon Apr 16 16:16:16 2018
New Revision: 1829294

URL: http://svn.apache.org/viewvc?rev=1829294=rev
Log:
* STATUS: Vote for r1829241.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1829294=1829293=1829294=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Apr 16 16:16:16 2018
@@ -34,7 +34,7 @@ Candidate changes:
Justification:
  A regression in 1.10.0. Broke 'make install-swig-rb-doc'.
Votes:
- +1: julianfoad
+ +1: julianfoad, stsp
 
  * r1829260
Revert r1751167, since it broke use of pre-generated Swig bindings in

svn propchange: r1751167 - svn:log

[jamessan]

Author: jamessan
Revision: 1751167
Modified property: svn:log

Modified: svn:log at Mon Apr 16 12:30:54 2018
--
--- svn:log (original)
+++ svn:log Mon Apr 16 12:30:54 2018
@@ -1,2 +1,3 @@
 * build/ac-macros/swig.m4:
   (SVN_FIND_SWIG): Configure the swig bindings only if swig has been enabled.
+[Note from the future; reverted in r1829260]

svn commit: r1829257 [9/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c 
(original)
+++ subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c Mon 
Apr 16 12:21:02 2018
@@ -301,47 +301,59 @@ static const apr_getopt_option_t options
 /* Array of available subcommands.
  * The entire list must be terminated with an entry of nulls.
  */
-static const svn_opt_subcommand_desc2_t cmd_table[] =
+static const svn_opt_subcommand_desc3_t cmd_table[] =
 {
-  {"crashtest", subcommand_crashtest, {0}, N_
-   ("usage: svnadmin crashtest REPOS_PATH\n\n"
+  {"crashtest", subcommand_crashtest, {0}, {N_(
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"), N_(
 "Open the repository at REPOS_PATH, then abort, thus simulating\n"
-"a process that crashes while holding an open repository handle.\n"),
+"a process that crashes while holding an open repository handle.\n"
+   )},
{0} },
 
-  {"create", subcommand_create, {0}, N_
-   ("usage: svnadmin create REPOS_PATH\n\n"
-"Create a new, empty repository at REPOS_PATH.\n"),
+  {"create", subcommand_create, {0}, {N_(
+"usage: svnadmin create REPOS_PATH\n"
+"\n"), N_(
+"Create a new, empty repository at REPOS_PATH.\n"
+   )},
{svnadmin__bdb_txn_nosync, svnadmin__bdb_log_keep,
 svnadmin__config_dir, svnadmin__fs_type, svnadmin__compatible_version,
 svnadmin__pre_1_4_compatible, svnadmin__pre_1_5_compatible,
 svnadmin__pre_1_6_compatible
 } },
 
-  {"delrevprop", subcommand_delrevprop, {0}, N_
-   ("usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n"
-"   2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n\n"
-"1. Delete the property NAME on revision REVISION.\n\n"
+  {"delrevprop", subcommand_delrevprop, {0}, {N_(
+"usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n"
+"   2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n"
+"\n"), N_(
+"1. Delete the property NAME on revision REVISION.\n"
+"\n"), N_(
 "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n"
 "trigger the revision property-related hooks (for example, if you want\n"
-"an email notification sent from your post-revprop-change hook).\n\n"
+"an email notification sent from your post-revprop-change hook).\n"
+"\n"), N_(
 "NOTE: Revision properties are not versioned, so this command will\n"
-"irreversibly destroy the previous value of the property.\n\n"
-"2. Delete the property NAME on transaction TXN.\n"),
+"irreversibly destroy the previous value of the property.\n"
+"\n"), N_(
+"2. Delete the property NAME on transaction TXN.\n"
+   )},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
 svnadmin__use_post_revprop_change_hook} },
 
-  {"deltify", subcommand_deltify, {0}, N_
-   ("usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n\n"
+  {"deltify", subcommand_deltify, {0}, {N_(
+"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
+"\n"), N_(
 "Run over the requested revision range, performing predecessor delti-\n"
 "fication on the paths changed in those revisions.  Deltification in\n"
 "essence compresses the repository by only storing the differences or\n"
 "delta from the preceding revision.  If no revisions are specified,\n"
-"this will simply deltify the HEAD revision.\n"),
+"this will simply deltify the HEAD revision.\n"
+   )},
{'r', 'q', 'M'} },
 
-  {"dump", subcommand_dump, {0}, N_
-   ("usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n\n"
+  {"dump", subcommand_dump, {0}, {N_(
+"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
+"\n"), N_(
 "Dump the contents of filesystem to stdout in a 'dumpfile'\n"
 "portable format, sending feedback to stderr.  Dump revisions\n"
 "LOWER rev through UPPER rev.  If no revisions are given, dump all\n"
@@ -351,76 +363,94 @@ static const svn_opt_subcommand_desc2_t
 "every path present in the repository as of that revision.  (In either\n"
 "case, the second and subsequent revisions, if any, describe only paths\n"
 "changed in those revisions.)\n"
-"\n"
+"\n"), N_(
 "Using --exclude or --include gives results equivalent to authz-based\n"
 "path exclusions. In particular, when the source of a copy is\n"
-"excluded, the copy is transformed into an add (unlike in 
'svndumpfilter').\n"),
+"excluded, the copy is transformed into an add (unlike in 
'svndumpfilter').\n"
+   )},
   {'r', svnadmin__incremental, svnadmin__deltas, 'q', 'M', 'F',
svnadmin__exclude, svnadmin__include, svnadmin__glob },
   {{'F', N_("write to file ARG instead of stdout")}} 

svn commit: r1829257 [5/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/po/de.po
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/po/de.po?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/shelve-checkpoint/subversion/po/de.po [UTF-8] Mon Apr 
16 12:21:02 2018
@@ -96,7 +96,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: d...@subversion.apache.org\n"
-"POT-Creation-Date: 2015-04-10 18:54+0200\n"
+"POT-Creation-Date: 2018-03-11 16:08+0100\n"
 "PO-Revision-Date: 2015-04-10 18:52+0100\n"
 "Last-Translator: Subversion Developers \n"
 "Language-Team: German \n"
@@ -225,7 +225,7 @@ msgstr "Pfad ist kein direktes Kind des
 msgid "Bogus UUID"
 msgstr "Ungültige UUID"
 
-#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1026
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1041
 msgid "Invalid configuration value"
 msgstr "Ungültiger Konfigurationswert"
 
@@ -257,1253 +257,1314 @@ msgstr "Ungültiges »atomic«"
 msgid "Invalid compression method"
 msgstr "Ungültige Komprimierungsmethode"
 
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:246
+#, fuzzy
+msgid "Unexpected line ending in the property value"
+msgstr "Unerwartete oder unbekannte Eigenschaftsart"
+
+#: ../include/svn_error_codes.h:252
 msgid "No such XML tag attribute"
 msgstr "Ein solches Attribut des XML-Tags existiert nicht"
 
-#: ../include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:256
 msgid " is missing ancestry"
 msgstr " fehlt die Herkunft"
 
-#: ../include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:260
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "Unbekannte binäre Datenkodierung, kann nicht entschlüsseln"
 
-#: ../include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:264
 msgid "XML data was not well-formed"
 msgstr "XML Daten nicht wohlgeformt"
 
-#: ../include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:268
 msgid "Data cannot be safely XML-escaped"
 msgstr "Daten können nicht sicher in XML eingebettet werden"
 
-#: ../include/svn_error_codes.h:268
+#: ../include/svn_error_codes.h:273
 msgid "Unexpected XML element found"
 msgstr "Unerwartetes XML-Element gefunden"
 
-#: ../include/svn_error_codes.h:274
+#: ../include/svn_error_codes.h:279
 msgid "Inconsistent line ending style"
 msgstr "Stil für Zeilenende ist inkonsistent"
 
-#: ../include/svn_error_codes.h:278
+#: ../include/svn_error_codes.h:283
 msgid "Unrecognized line ending style"
 msgstr "Stil für Zeilenende nicht erkannt"
 
-#: ../include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:288
 msgid "Line endings other than expected"
 msgstr "Zeilenende anders als erwartet"
 
-#: ../include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:292
 msgid "Ran out of unique names"
 msgstr "Eindeutige Namen ausgegangen"
 
-#: ../include/svn_error_codes.h:292
+#: ../include/svn_error_codes.h:297
 msgid "Framing error in pipe protocol"
 msgstr "Rahmenfehler im »Pipe«-Protokoll"
 
-#: ../include/svn_error_codes.h:297
+#: ../include/svn_error_codes.h:302
 msgid "Read error in pipe"
 msgstr "Lesefehler in »Pipe«"
 
 #. is errno on POSIX
-#: ../include/svn_error_codes.h:301 ../libsvn_subr/cmdline.c:417
-#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:571
-#: ../svnlook/svnlook.c:2025
+#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435
+#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571
+#: ../svnlook/svnlook.c:2034
 #, c-format
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: ../include/svn_error_codes.h:306
+#: ../include/svn_error_codes.h:311
 msgid "Write error in pipe"
 msgstr "Schreibfehler in »Pipe«"
 
-#: ../include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:317
 msgid "Unexpected EOF on stream"
 msgstr "Unerwartetes EOF im Datenstrom"
 
-#: ../include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:321
 msgid "Malformed stream data"
 msgstr "Fehlerhafter Datenstrom"
 
-#: ../include/svn_error_codes.h:320
+#: ../include/svn_error_codes.h:325
 msgid "Unrecognized stream data"
 msgstr "Unbekannter Datenstrom"
 
-#: ../include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:330
 msgid "Stream doesn't support seeking"
 msgstr "Datenstrom unterstützt das Setzen der Position nicht"
 
-#: ../include/svn_error_codes.h:330
+#: ../include/svn_error_codes.h:335
 msgid "Stream doesn't support this capability"
 msgstr "Datenstrom unterstützt diese Funktion nicht"
 
-#: ../include/svn_error_codes.h:336
+#: ../include/svn_error_codes.h:341
 msgid "Unknown svn_node_kind"
 msgstr "Unbekannter svn_node_kind"
 
-#: ../include/svn_error_codes.h:340
+#: ../include/svn_error_codes.h:345
 msgid "Unexpected node 

svn commit: r1829257 [10/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/binding

[julianfoad]

Modified: 
subversion/branches/shelve-checkpoint/subversion/tests/cmdline/davautocheck.sh
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/tests/cmdline/davautocheck.sh?rev=1829257=1829256=1829257=diff
==
--- 
subversion/branches/shelve-checkpoint/subversion/tests/cmdline/davautocheck.sh 
(original)
+++ 
subversion/branches/shelve-checkpoint/subversion/tests/cmdline/davautocheck.sh 
Mon Apr 16 12:21:02 2018
@@ -52,6 +52,7 @@
 # Run this script with the test suite name and test number to execute just this
 # test:
 #   subversion/tests/cmdline/davautocheck.sh basic 4
+# This script can also be invoked via "make davautocheck".
 #
 # If the temporary directory is not deleted, it can be reused for further
 # manual DAV protocol interoperation testing. HTTPD must be started by
@@ -65,18 +66,19 @@
 #   APXS=/opt/svn/1.4.x/bin/apxs MODULE_PATH=/opt/svn/1.4.x/modules \
 # subversion/tests/cmdline/davautocheck.sh
 #
-# To prevent the server from advertising httpv2, pass USE_HTTPV1 in
-# the environment.
+# Other environment variables that are interpreted by this script:
 #
-# To enable "SVNCacheRevProps on" set CACHE_REVPROPS in the environment.
+#  make davautocheck CACHE_REVPROPS=1   # sets SVNCacheRevProps on
 #
-# To test over https set USE_SSL in the environment.
+#  make davautocheck BLOCK_READ=1   # sets SVNBlockRead on
 #
-# To use value for "SVNPathAuthz" directive set SVN_PATH_AUTHZ with
-# appropriate value in the environment.
+#  make davautocheck USE_SSL=1  # run over https
 #
-# To load an MPM module for Apache 2.4 use APACHE_MPM=event in the
-# environment.
+#  make davautocheck USE_HTTPV1=1   # sets SVNAdvertiseV2Protocol off
+#
+#  make davautocheck APACHE_MPM=event   # specifies the 2.4 MPM
+#
+#  make davautocheck SVN_PATH_AUTHZ=short_circuit  # SVNPathAuthz short_circuit
 #
 # Passing --no-tests as argv[1] will have the script start a server
 # but not run any tests.  Passing --gdb or --lldb will do the same, and in
@@ -222,6 +224,11 @@ if [ ${CACHE_REVPROPS:+set} ]; then
   CACHE_REVPROPS_SETTING=on
 fi
 
+BLOCK_READ_SETTING=off
+if [ ${BLOCK_READ:+set} ]; then
+  BLOCK_READ_SETTING=on
+fi
+
 if [ ${MODULE_PATH:+set} ]; then
 MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so"
 MOD_AUTHZ_SVN="$MODULE_PATH/mod_authz_svn.so"
@@ -274,6 +281,9 @@ say "Using '$HTPASSWD'..."
 LOAD_MOD_DAV=$(get_loadmodule_config mod_dav) \
   || fail "DAV module not found"
 
+LOAD_MOD_DAV_FS=$(get_loadmodule_config mod_dav_fs) \
+  || fail "Filesystem DAV module not found"
+
 LOAD_MOD_LOG_CONFIG=$(get_loadmodule_config mod_log_config) \
   || fail "log_config module not found"
 
@@ -440,6 +450,7 @@ $LOAD_MOD_MIME
 $LOAD_MOD_ALIAS
 $LOAD_MOD_UNIXD
 $LOAD_MOD_DAV
+$LOAD_MOD_DAV_FS
 LoadModule  dav_svn_module "$MOD_DAV_SVN"
 $LOAD_MOD_AUTH
 $LOAD_MOD_AUTHN_CORE
@@ -475,6 +486,13 @@ mkdir "$HTTPD_LOCK" \
 __EOF__
 fi
 
+HTTPD_DAV="$HTTPD_ROOT/dav"
+mkdir "$HTTPD_DAV" \
+|| fail "couldn't create DAV lock directory '$HTTPD_DAV'"
+cat >> "$HTTPD_CFG" <<__EOF__
+DavLockDB "$HTTPD_DAV/lock.db"
+__EOF__
+
 if [ ${USE_SSL:+set} ]; then
 cat >> "$HTTPD_CFG" <<__EOF__
 SSLEngine on
@@ -518,40 +536,51 @@ CustomLog   "$HTTPD_ROOT/ops" "%
   #Require   all granted
 
 
+Alias /nodavroot $ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/nodavroot
+
+
+
+Alias /fsdavroot $ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/fsdavroot
+
+  DAV filesystem
+
+
 
+__EOF__
+location_common() {
+cat >> "$HTTPD_CFG" <<__EOF__
   DAV   svn
-  SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
   AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
   AuthType  Basic
   AuthName  "Subversion Repository"
   AuthUserFile  $HTTPD_USERS
-  Require   valid-user
   SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
   SVNCacheRevProps  ${CACHE_REVPROPS_SETTING}
+  SVNListParentPath On
+  SVNBlockRead  ${BLOCK_READ_SETTING}
+__EOF__
+}
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
+  SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
+  Require   valid-user
   ${SVN_PATH_AUTHZ_LINE}
 
 
-  DAV   svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
-  AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
-  AuthType  Basic
-  AuthName  "Subversion Repository"
-  AuthUserFile  $HTTPD_USERS
   Require   valid-user
-  SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
-  SVNCacheRevProps  ${CACHE_REVPROPS_SETTING}
   ${SVN_PATH_AUTHZ_LINE}
   DontDoThatConfigFile "$HTTPD_DONTDOTHAT"
 
 
-  DAV   svn
+__EOF__
+location_common
+cat >> "$HTTPD_CFG" <<__EOF__
   

svn commit: r1829257 [4/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: 
subversion/branches/shelve-checkpoint/subversion/mod_authz_svn/mod_authz_svn.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/mod_authz_svn/mod_authz_svn.c?rev=1829257=1829256=1829257=diff
==
--- 
subversion/branches/shelve-checkpoint/subversion/mod_authz_svn/mod_authz_svn.c 
(original)
+++ 
subversion/branches/shelve-checkpoint/subversion/mod_authz_svn/mod_authz_svn.c 
Mon Apr 16 12:21:02 2018
@@ -401,10 +401,12 @@ static svn_authz_t *
 get_access_conf(request_rec *r, authz_svn_config_rec *conf,
 apr_pool_t *scratch_pool)
 {
+  const char *cache_key = NULL;
   const char *access_file;
   const char *groups_file;
   const char *repos_path;
   const char *repos_url = NULL;
+  void *user_data = NULL;
   svn_authz_t *access_conf = NULL;
   svn_error_t *svn_err = SVN_NO_ERROR;
   dav_error *dav_err;
@@ -464,19 +466,31 @@ get_access_conf(request_rec *r, authz_sv
 "Path to groups file is %s", groups_file);
 }
 
-  svn_err = svn_repos_authz_read3(_conf,
-  access_file, groups_file,
-  TRUE, NULL,
-  r->connection->pool, scratch_pool);
+  cache_key = apr_pstrcat(scratch_pool, "mod_authz_svn:",
+  access_file, groups_file, SVN_VA_NULL);
+  apr_pool_userdata_get(_data, cache_key, r->connection->pool);
+  access_conf = user_data;
+  if (access_conf == NULL)
+{
+  svn_err = svn_repos_authz_read3(_conf, access_file,
+  groups_file, TRUE, NULL,
+  r->connection->pool,
+  scratch_pool);
 
-  if (svn_err)
-{
-  log_svn_error(APLOG_MARK, r,
-"Failed to load the mod_authz_svn config:",
-svn_err, scratch_pool);
-  access_conf = NULL;
+  if (svn_err)
+{
+  log_svn_error(APLOG_MARK, r,
+"Failed to load the mod_authz_svn config:",
+svn_err, scratch_pool);
+  access_conf = NULL;
+}
+  else
+{
+  /* Cache the open repos for the next request on this connection */
+  apr_pool_userdata_set(access_conf, cache_key,
+NULL, r->connection->pool);
+}
 }
-
   return access_conf;
 }
 

svn commit: r1829257 [2/11] - in /subversion/branches/shelve-checkpoint: ./ build/ build/ac-macros/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/jniwrapper/ subversion/bindings

[julianfoad]

Modified: subversion/branches/shelve-checkpoint/subversion/include/svn_fs.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/include/svn_fs.h?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/include/svn_fs.h (original)
+++ subversion/branches/shelve-checkpoint/subversion/include/svn_fs.h Mon Apr 
16 12:21:02 2018
@@ -1744,7 +1744,7 @@ svn_fs_paths_changed3(svn_fs_path_change
  *
  * Use @a pool for all allocations, including the hash and its values.
  *
- * @note Retrieving the #node_rev_id element of #svn_fs_path_change2_t may
+ * @note Retrieving the #svn_fs_path_change2_t.node_rev_id element may
  *   be expensive in some FS backends.
  *
  * @since New in 1.6.
@@ -2492,7 +2492,7 @@ svn_fs_file_md5_checksum(unsigned char d
  * svn_fs_file_contents().  In that case, the result of reading from
  * @a *contents is undefined.
  *
- * ### @todo kff: I am worried about lifetime issues with this pool vs
+ * @todo kff: I am worried about lifetime issues with this pool vs
  * the trail created farther down the call stack.  Trace this function
  * to investigate...
  */

Modified: subversion/branches/shelve-checkpoint/subversion/include/svn_opt.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/include/svn_opt.h?rev=1829257=1829256=1829257=diff
==
--- subversion/branches/shelve-checkpoint/subversion/include/svn_opt.h 
(original)
+++ subversion/branches/shelve-checkpoint/subversion/include/svn_opt.h Mon Apr 
16 12:21:02 2018
@@ -69,6 +69,10 @@ typedef svn_error_t *(svn_opt_subcommand
 /** The maximum number of options that can be accepted by a subcommand. */
 #define SVN_OPT_MAX_OPTIONS 50
 
+/** The maximum number of paragraphs of help text a subcommand can have.
+ * @since New in 1.11. */
+#define SVN_OPT_MAX_PARAGRAPHS 100
+
 /** Options that have no short option char should use an identifying
  * integer equal to or greater than this.
  */
@@ -77,7 +81,39 @@ typedef svn_error_t *(svn_opt_subcommand
 
 /** One element of a subcommand dispatch table.
  *
+ * @since New in 1.11.
+ */
+typedef struct svn_opt_subcommand_desc3_t
+{
+  /** The full name of this command. */
+  const char *name;
+
+  /** The function this command invokes. */
+  svn_opt_subcommand_t *cmd_func;
+
+  /** A list of alias names for this command (e.g., 'up' for 'update'). */
+  const char *aliases[SVN_OPT_MAX_ALIASES];
+
+  /** A multi-paragraph string describing this command. */
+  const char *help[SVN_OPT_MAX_PARAGRAPHS];
+
+  /** A list of options accepted by this command.  Each value in the
+   * array is a unique enum (the 2nd field in apr_getopt_option_t)
+   */
+  int valid_options[SVN_OPT_MAX_OPTIONS];
+
+  /** A list of option help descriptions, keyed by the option unique enum
+   * (the 2nd field in apr_getopt_option_t), which override the generic
+   * descriptions given in an apr_getopt_option_t on a per-subcommand basis.
+   */
+  struct { int optch; const char *desc; } desc_overrides[SVN_OPT_MAX_OPTIONS];
+} svn_opt_subcommand_desc3_t;
+
+
+/** One element of a subcommand dispatch table.
+ *
  * @since New in 1.4.
+ * @deprecated Provided for backward compatibility with the 1.10 API.
  */
 typedef struct svn_opt_subcommand_desc2_t
 {
@@ -139,8 +175,21 @@ typedef struct svn_opt_subcommand_desc_t
  * Return the entry in @a table whose name matches @a cmd_name, or @c NULL if
  * none.  @a cmd_name may be an alias.
  *
+ * @since New in 1.11.
+ */
+const svn_opt_subcommand_desc3_t *
+svn_opt_get_canonical_subcommand3(const svn_opt_subcommand_desc3_t *table,
+  const char *cmd_name);
+
+
+/**
+ * Same as svn_opt_get_canonical_subcommand3(), but with a different
+ * version of the subcommand description table.
+ *
  * @since New in 1.4.
+ * @deprecated Provided for backward compatibility with the 1.10 API.
  */
+SVN_DEPRECATED
 const svn_opt_subcommand_desc2_t *
 svn_opt_get_canonical_subcommand2(const svn_opt_subcommand_desc2_t *table,
   const char *cmd_name);
@@ -170,8 +219,22 @@ svn_opt_get_canonical_subcommand(const s
  *
  * The returned value may be statically allocated, or allocated in @a pool.
  *
+ * @since New in 1.11.
+ */
+const apr_getopt_option_t *
+svn_opt_get_option_from_code3(int code,
+  const apr_getopt_option_t *option_table,
+  const svn_opt_subcommand_desc3_t *command,
+  apr_pool_t *pool);
+
+/**
+ * Same as svn_opt_get_option_from_code3(), but with a different
+ * version of the subcommand description table.
+ *
  * @since New in 1.4.
+ * @deprecated Provided for backward compatibility with the 1.10 API.
  */
+SVN_DEPRECATED
 const apr_getopt_option_t *
 svn_opt_get_option_from_code2(int code,
 

svn commit: r1829270 - /subversion/branches/1.10.x/STATUS

[jamessan]

Author: jamessan
Date: Mon Apr 16 13:05:32 2018
New Revision: 1829270

URL: http://svn.apache.org/viewvc?rev=1829270=rev
Log:
* STATUS: Nominate r1829260.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1829270=1829269=1829270=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Apr 16 13:05:32 2018
@@ -36,6 +36,14 @@ Candidate changes:
Votes:
  +1: julianfoad
 
+ * r1829260
+   Revert r1751167, since it broke use of pre-generated Swig bindings in
+   release builds.
+   Justification:
+ Fix build of pre-generated Swig bindings when swig is not installed
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =
 

svn commit: r1829287 - /subversion/branches/shelve-checkpoint/

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 14:17:24 2018
New Revision: 1829287

URL: http://svn.apache.org/viewvc?rev=1829287=rev
Log:
On the 'shelve-checkpoint' branch: catch up with trunk@1829286.

Modified:
subversion/branches/shelve-checkpoint/   (props changed)

Propchange: subversion/branches/shelve-checkpoint/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 14:17:24 2018
@@ -98,4 +98,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1801593-1829280
+/subversion/trunk:1801593-1829286

svn commit: r1829288 - /subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 14:30:04 2018
New Revision: 1829288

URL: http://svn.apache.org/viewvc?rev=1829288=rev
Log:
On the 'shelve-checkpoint' branch: fix wrongly resolved conflict from r1829257.

Modified:
subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c

Modified: subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c?rev=1829288=1829287=1829288=diff
==
--- subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c 
(original)
+++ subversion/branches/shelve-checkpoint/subversion/svnadmin/svnadmin.c Mon 
Apr 16 14:30:04 2018
@@ -386,7 +386,7 @@ static const svn_opt_subcommand_desc3_t
 
   {"freeze", subcommand_freeze, {0}, {N_(
 "usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n"
-"   2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n\n"
+"   2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n"
 "\n"), N_(
 "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
 "   Allows safe use of third-party backup tools on a live repository.\n"

svn commit: r1829285 - in /subversion/trunk: ./ subversion/svnadmin/svnadmin.c

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 14:12:35 2018
New Revision: 1829285

URL: http://svn.apache.org/viewvc?rev=1829285=rev
Log:
* subversion/svnadmin/svnadmin.c
  (cmd_table): Document use of '--' with the 'freeze' command.

This is a merge of r1828521 from the 'shelve-checkpoint' branch where I
committed it by mistake.

Modified:
subversion/trunk/   (props changed)
subversion/trunk/subversion/svnadmin/svnadmin.c

Propchange: subversion/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 14:12:35 2018
@@ -76,7 +76,7 @@
 /subversion/branches/revprop-caching-ng:1620597,1620599
 
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
 /subversion/branches/shelve:1802592-1815226
-/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508
+/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508,1828521
 /subversion/branches/subtree-mergeinfo:876734-878766
 /subversion/branches/svn-auth-x509:1603509-1655900
 /subversion/branches/svn-info-detail:1660035-1662618

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1829285=1829284=1829285=diff
==
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Mon Apr 16 14:12:35 2018
@@ -385,8 +385,8 @@ static const svn_opt_subcommand_desc3_t
   {{'F', N_("write to file ARG instead of stdout")}} },
 
   {"freeze", subcommand_freeze, {0}, {N_(
-"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
-"   2. svnadmin freeze -F FILE PROGRAM [ARG...]\n"
+"usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n"
+"   2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n"
 "\n"), N_(
 "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
 "   Allows safe use of third-party backup tools on a live repository.\n"
@@ -394,6 +394,9 @@ static const svn_opt_subcommand_desc3_t
 "2. Like 1 except all repositories listed in FILE are locked. The file\n"
 "   format is repository paths separated by newlines.  Repositories are\n"
 "   locked in the same order as they are listed in the file.\n"
+"\n"
+"The '--' tells svnadmin to stop looking for svnadmin options and pass\n"
+"all later arguments to PROGRAM even if they begin with '-'.\n"
)},
{'F'},
{{'F', N_("read repository paths from file ARG")}} },

svn commit: r1829274 - in /subversion/trunk: ./ contrib/client-side/ contrib/client-side/svnmerge/ contrib/hook-scripts/ subversion/bindings/javahl/tests/org/apache/subversion/javahl/ subversion/bindi

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 13:51:21 2018
New Revision: 1829274

URL: http://svn.apache.org/viewvc?rev=1829274=rev
Log:
Update issue tracker links in comments, from Tigris (issuezilla) to Apache 
(Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

This is a merge of r1828508 from the 'shelve-checkpoint' branch where I
committed it by mistake.

Modified:
subversion/trunk/   (props changed)
subversion/trunk/contrib/client-side/svn_update.pl
subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
subversion/trunk/contrib/client-side/svnmerge/svnmerge.py
subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py

subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/swig/ruby/test/test_client.rb
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_utf.h
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/libsvn_repos/log.c
subversion/trunk/subversion/libsvn_subr/config_win.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/utf.c
subversion/trunk/subversion/mod_dav_svn/reports/replay.c
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/propset-cmd.c
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/dav-mirror-autocheck.sh
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/export_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/log_tests.py
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py

Propchange: subversion/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 13:51:21 2018
@@ -76,7 +76,7 @@
 /subversion/branches/revprop-caching-ng:1620597,1620599
 
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
 /subversion/branches/shelve:1802592-1815226
-/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320
+/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508
 /subversion/branches/subtree-mergeinfo:876734-878766
 /subversion/branches/svn-auth-x509:1603509-1655900
 /subversion/branches/svn-info-detail:1660035-1662618

Modified: subversion/trunk/contrib/client-side/svn_update.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_update.pl?rev=1829274=1829273=1829274=diff
==
--- subversion/trunk/contrib/client-side/svn_update.pl (original)
+++ subversion/trunk/contrib/client-side/svn_update.pl Mon Apr 16 13:51:21 2018
@@ -31,7 +31,7 @@
 # given file(s) that would require >n minutes, where n is the
 # server's magic timeout (5 min.??), the server will timeout.  This
 # leaves the client/user in an unswell state.  See issue #2048 for
-# details http://subversion.tigris.org/issues/show_bug.cgi?id=2048.
+# details https://issues.apache.org/jira/browse/SVN-2048.
 #
 # One solution is to wrap the 'svn update' command in a script that
 # will perform the update one file at a time.  The problem with

Modified: 
subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py?rev=1829274=1829273=1829274=diff

svn commit: r1829317 - /subversion/site/publish/docs/release-notes/1.10.html

[luke1410]

Author: luke1410
Date: Mon Apr 16 21:52:05 2018
New Revision: 1829317

URL: http://svn.apache.org/viewvc?rev=1829317=rev
Log:
* publish/docs/release-notes/1.10.html:
  (ls-search): Add missing colon.
  (client-server-improvements): Tweak title slight.

Modified:
subversion/site/publish/docs/release-notes/1.10.html

Modified: subversion/site/publish/docs/release-notes/1.10.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1829317=1829316=1829317=diff
==
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Mon Apr 16 21:52:05 
2018
@@ -765,7 +765,7 @@ which happen to contain upper-case and n
 
 You may now specify one or more glob patterns in a svn ls
 request.  Note that most shells require globs to be put in quotation
-marks to be passed as-is to SVN.  Example
+marks to be passed as-is to SVN.  Example:

svn ls svn://server/repo --recursive --search "readme*"
 Against a Subversion 1.10 server, this command will be executed
@@ -899,7 +899,7 @@ wildcards (the same as in 'svndumpfilter
  
 
 
-Client-server improvements
+Client- and server-side improvements
   
 

svn commit: r1829319 - /subversion/branches/1.8.x/STATUS

[luke1410]

Author: luke1410
Date: Mon Apr 16 21:58:26 2018
New Revision: 1829319

URL: http://svn.apache.org/viewvc?rev=1829319=rev
Log:
* STATUS: Approve documentation fix (doesn't need voting).

Modified:
subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1829319=1829318=1829319=diff
==
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Apr 16 21:58:26 2018
@@ -42,16 +42,6 @@ Candidate changes:
Votes:
  +1: julianfoad, stsp
 
- * r1828782
-   Document build issues with certain SQLite versions using Visual Studio
-   2005+.
-   Justification:
- Help new users to prevent avoidable build issues.
-   Branch:
- ^/subversion/branches/1.8.x-sqlite-compatibility-docu
-   Votes:
- +1: luke1410
-
 Veto-blocked changes:
 =
 
@@ -73,3 +63,13 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1828782
+   Document build issues with certain SQLite versions using Visual Studio
+   2005+.
+   Justification:
+ Help new users to prevent avoidable build issues.
+   Branch:
+ ^/subversion/branches/1.8.x-sqlite-compatibility-docu
+   Votes:
+ +1: luke1410

svn commit: r1829318 - in /subversion/site/staging: ./ docs/community-guide/ docs/release-notes/

[luke1410]

Author: luke1410
Date: Mon Apr 16 21:55:17 2018
New Revision: 1829318

URL: http://svn.apache.org/viewvc?rev=1829318=rev
Log:
Sync merge from publish to staging.

Modified:
subversion/site/staging/   (props changed)
subversion/site/staging/doap.rdf
subversion/site/staging/docs/community-guide/releasing.part.html
subversion/site/staging/docs/release-notes/1.10.html
subversion/site/staging/docs/release-notes/index.html
subversion/site/staging/docs/release-notes/release-history.html
subversion/site/staging/download.html
subversion/site/staging/index.html   (contents, props changed)
subversion/site/staging/mailing-lists.html
subversion/site/staging/news.html   (contents, props changed)
subversion/site/staging/roadmap.html

Propchange: subversion/site/staging/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 21:55:17 2018
@@ -1 +1 @@
-/subversion/site/publish:1812681-1825884
+/subversion/site/publish:1812681-1829317

Modified: subversion/site/staging/doap.rdf
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/doap.rdf?rev=1829318=1829317=1829318=diff
==
--- subversion/site/staging/doap.rdf (original)
+++ subversion/site/staging/doap.rdf Mon Apr 16 21:55:17 2018
@@ -36,23 +36,23 @@
 http://projects.apache.org/category/build-management; />
 
   
-Recommended current 1.9 release
-2017-08-10
-1.9.7
+Recommended current 1.10 release
+2018-04-12
+1.10.0
   
 
 
   
-Current 1.8 release
+Current 1.9 release
 2017-08-10
-1.8.19
+1.9.7
   
 
 
   
-Current 1.7 release
-2015-08-14
-1.7.22
+Current 1.8 release
+2017-08-10
+1.8.19
   
 
 

Modified: subversion/site/staging/docs/community-guide/releasing.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1829318=1829317=1829318=diff
==
--- subversion/site/staging/docs/community-guide/releasing.part.html (original)
+++ subversion/site/staging/docs/community-guide/releasing.part.html Mon Apr 16 
21:55:17 2018
@@ -1058,6 +1058,12 @@ manager.
 validated, the release is ready for publication.  This section outlines the
 steps needed to publish a Subversion release.
 
+
+Uploading the release
+  #releasing-upload"
+title="Link to this section">
+
+
 Subversion artifacts are distributed through the 
 https://www.apache.org/dev/mirrors.html;>ASF mirror network.  The
 source code download page automatically assists 
users
@@ -1066,20 +1072,19 @@ release for the supported release lines
 previous Subversion releases are available in the
 https://archive.apache.org/dist/subversion/;>archives.
 
-Uploading releases to the mirrors is rather straightforward: the RM simply
-moves the tarballs, signatures and checksums from
+To upload a release to the mirrors:
+
+release.py move-to-dist 1.7.0
+
+This moves the tarballs, signatures and checksums from
 https://dist.apache.org/repos/dist/dev/subversion;
 >^/dev/subversion
 to https://dist.apache.org/repos/dist/release/subversion;
 >^/release/subversion.
-There is a release.py subcommand that automates this step:
-
-release.py move-to-dist 1.7.0
-
 It takes the mirrors up to 24 hours to get pick up the new release.
 The archive will also automatically pick up the release.  While
-running move-to-dist will move the signature files committers are
-still able to commit new signatures to ^/release/subversion
+running move-to-dist will move the signature files, committers are
+still able to commit new signatures to ^/release/subversion;
 however it will take up to 24 hours for those signatures to mirror.
 Any such signatures cannot be included in the release announcement
 unless 24 hours have passed since they were committed.
@@ -1104,6 +1109,8 @@ release.py clean-dist
 href="https://reporter.apache.org/addrelease.html?subversion;
 >reporter.apache.org. (Can we automate that?)
 
+ 
+
 
 Press releases for 1.x.0 releases
   #releasing-press"

Modified: subversion/site/staging/docs/release-notes/1.10.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1829318=1829317=1829318=diff
==
--- subversion/site/staging/docs/release-notes/1.10.html (original)
+++ subversion/site/staging/docs/release-notes/1.10.html Mon Apr 16 21:55:17 
2018
@@ -23,11 +23,6 @@
 
 Apache Subversion 1.10 Release Notes
 
-
-This is work in progress.
-  Subversion 1.10 has not been released yet.
-
-
 
 What's New in Apache Subversion 1.10
   LZ4 Compression
   Shelving
+  >Shelving (experimental)
   Many enhancements 

svn commit: r1829242 - /subversion/branches/1.10.x/STATUS

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 08:00:09 2018
New Revision: 1829242

URL: http://svn.apache.org/viewvc?rev=1829242=rev
Log:
* STATUS: Nominate r1829241.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1829242=1829241=1829242=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Apr 16 08:00:09 2018
@@ -29,6 +29,13 @@ Candidate changes:
   Votes:
 +1: brane
 
+ * r1829241
+   * configure.ac   Fix variable name with path to rdoc, broken in r1806570.
+   Justification:
+ A regression in 1.10.0. Broke 'make install-swig-rb-doc'.
+   Votes:
+ +1: julianfoad
+
 Veto-blocked changes:
 =
 

svn commit: r1829241 - /subversion/trunk/configure.ac

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 07:55:10 2018
New Revision: 1829241

URL: http://svn.apache.org/viewvc?rev=1829241=rev
Log:
* configure.ac
  Fix variable name with path to rdoc, broken in r1806570.

Found by: Jan Palus 

Modified:
subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1829241=1829240=1829241=diff
==
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Apr 16 07:55:10 2018
@@ -1323,7 +1323,7 @@ if test "$RUBY" != "none"; then
 if test -n "$RDOC"; then
   AC_PATH_PROG(RDOC, "$RDOC", none)
 else
-  AC_PATH_PROGS(RUBY, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 
rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23 
rdoc2.4 rdoc24, none)
+  AC_PATH_PROGS(RDOC, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 
rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23 
rdoc2.4 rdoc24, none)
 fi
 AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
 svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print 
RbConfig::CONFIG.fetch(%q(MAJOR))'`"

svn commit: r1829326 - in /subversion/branches/1.8.x: ./ INSTALL STATUS

[svn-role]

Author: svn-role
Date: Tue Apr 17 04:00:12 2018
New Revision: 1829326

URL: http://svn.apache.org/viewvc?rev=1829326=rev
Log:
Merge the 1.8.x-sqlite-compatibility-docu branch:

 * r1828782
   Document build issues with certain SQLite versions using Visual Studio
   2005+.
   Justification:
 Help new users to prevent avoidable build issues.
   Branch:
 ^/subversion/branches/1.8.x-sqlite-compatibility-docu
   Votes:
 +1: luke1410

Modified:
subversion/branches/1.8.x/   (props changed)
subversion/branches/1.8.x/INSTALL
subversion/branches/1.8.x/STATUS

Propchange: subversion/branches/1.8.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 17 04:00:12 2018
@@ -82,6 +82,7 @@
 /subversion/branches/1.8.x-rm-external-dir:1600632-1615197
 /subversion/branches/1.8.x-serf-1.3+-windows:1517122-1533873
 /subversion/branches/1.8.x-serf-no-lock-support:1584583-1591109
+/subversion/branches/1.8.x-sqlite-compatibility-docu:1828781-1829325
 /subversion/branches/1.8.x-strict-rep-sharing:1787634-1800614
 /subversion/branches/1.8.x-svn_fs_info-removal:1467420-1468159
 /subversion/branches/1.8.x-svnsync-serf-memory:1515248-1515701

Modified: subversion/branches/1.8.x/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/INSTALL?rev=1829326=1829325=1829326=diff
==
--- subversion/branches/1.8.x/INSTALL (original)
+++ subversion/branches/1.8.x/INSTALL Tue Apr 17 04:00:12 2018
@@ -491,6 +491,10 @@ I.INTRODUCTION
 
   http://www.sqlite.org/download.html
 
+  Note that SQLite 3.12.0 to 3.20.1 will cause build errors on Windows with
+  Visual Studio 2005+. It's therefore suggested to use SQLite 3.21.0 or
+  above.
+
 
   14. pkg-config  (Unix only, OPTIONAL)
 

Modified: subversion/branches/1.8.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1829326=1829325=1829326=diff
==
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Apr 17 04:00:12 2018
@@ -63,13 +63,3 @@ Veto-blocked changes:
 
 Approved changes:
 =
-
- * r1828782
-   Document build issues with certain SQLite versions using Visual Studio
-   2005+.
-   Justification:
- Help new users to prevent avoidable build issues.
-   Branch:
- ^/subversion/branches/1.8.x-sqlite-compatibility-docu
-   Votes:
- +1: luke1410

svn commit: r1829327 - /subversion/branches/1.8.x-sqlite-compatibility-docu/

[svn-role]

Author: svn-role
Date: Tue Apr 17 04:00:27 2018
New Revision: 1829327

URL: http://svn.apache.org/viewvc?rev=1829327=rev
Log:
Remove the '1.8.x-sqlite-compatibility-docu' branch, merged in r1829326.

Removed:
subversion/branches/1.8.x-sqlite-compatibility-docu/

svn commit: r1829281 - in /subversion/branches/shelve-checkpoint: ./ build/ac-macros/ notes/ notes/http-and-webdav/ notes/merge-tracking/ notes/obliterate/ notes/tree-conflicts/

[julianfoad]

Author: julianfoad
Date: Mon Apr 16 14:04:11 2018
New Revision: 1829281

URL: http://svn.apache.org/viewvc?rev=1829281=rev
Log:
On the 'shelve-checkpoint' branch: catch up with trunk@1829280.

Modified:
subversion/branches/shelve-checkpoint/   (props changed)
subversion/branches/shelve-checkpoint/CHANGES
subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4
subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt
subversion/branches/shelve-checkpoint/notes/client-configuration
subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt
subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol
subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html
subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html
subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html

subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt

subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt
subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt
subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt

Propchange: subversion/branches/shelve-checkpoint/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 14:04:11 2018
@@ -98,4 +98,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1801593-1829253
+/subversion/trunk:1801593-1829280

Modified: subversion/branches/shelve-checkpoint/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/CHANGES?rev=1829281=1829280=1829281=diff
==
--- subversion/branches/shelve-checkpoint/CHANGES (original)
+++ subversion/branches/shelve-checkpoint/CHANGES Mon Apr 16 14:04:11 2018
@@ -5725,7 +5725,7 @@ http://svn.apache.org/repos/asf/subversi
   twice as slow and lose all concurrent-client scalability.
 
   This is a temporary fix for a larger design problem.  See issue
-  http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+  https://issues.apache.org/jira/browse/SVN-1499
 
 
 Version 0.28.1

Modified: subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4?rev=1829281=1829280=1829281=diff
==
--- subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4 (original)
+++ subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4 Mon Apr 16 
14:04:11 2018
@@ -98,202 +98,202 @@ AC_DEFUN(SVN_FIND_SWIG,
   AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
   AC_MSG_WARN([Subversion requires SWIG >= 1.3.24])
 fi
+  fi
+ 
+  SWIG_PY_COMPILE="none"
+  SWIG_PY_LINK="none"
+  if test "$PYTHON" != "none"; then
+AC_MSG_NOTICE([Configuring python swig binding])
+
+AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
+  ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--includes`"
+])
+SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
-SWIG_PY_COMPILE="none"
-SWIG_PY_LINK="none"
-if test "$PYTHON" != "none"; then
-  AC_MSG_NOTICE([Configuring python swig binding])
-
-  AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
-ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--includes`"
-  ])
-  SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+if test "$ac_cv_python_includes" = "none"; then
+  AC_MSG_WARN([python bindings cannot be built without distutils module])
+fi
 
-  if test "$ac_cv_python_includes" = "none"; then
-AC_MSG_WARN([python bindings cannot be built without distutils module])
+AC_CACHE_CHECK([for compiling Python extensions], [ac_cv_python_compile],[
+  ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--compile`"
+])
+SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+
+AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
+  ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+])
+SWIG_PY_LINK="$ac_cv_python_link"
+
+AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
+  ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+])
+SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
+
+dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
+dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
+dnl thus the egrep patterns have a + in them.
+SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"