svn commit: r1841181 - /subversion/branches/java10-compat/

Author: jamessan Date: Tue Sep 18 02:05:41 2018 New Revision: 1841181 URL: http://svn.apache.org/viewvc?rev=1841181&view=rev Log: Remove 'java10-compat' branch, merged to trunk in r1841180 Removed: subversion/branches/java10-compat/

svn commit: r1841180 - in /subversion/trunk: ./ Makefile.in build.conf build/generator/gen_base.py build/generator/gen_make.py build/generator/gen_win.py build/generator/templates/build-outputs.mk.ezt

Author: jamessan Date: Tue Sep 18 02:01:25 2018 New Revision: 1841180 URL: http://svn.apache.org/viewvc?rev=1841180&view=rev Log: Merge the 'java10-compat' branch to trunk Modified: subversion/trunk/ (props changed) subversion/trunk/Makefile.in subversion/trunk/build.conf subver

svn commit: r1841179 [1/2] - in /subversion/branches/java10-compat: ./ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/include/ subversion/libsvn_client/ subversion/libsvn_wc/

Author: jamessan Date: Tue Sep 18 01:50:50 2018 New Revision: 1841179 URL: http://svn.apache.org/viewvc?rev=1841179&view=rev Log: On the 'java10-compat' branch: Catch up with trunk @1841178 Added: subversion/branches/java10-compat/tools/dist/changes-to-html.py - copied unchanged from r1

svn commit: r1841179 [2/2] - in /subversion/branches/java10-compat: ./ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/include/ subversion/libsvn_client/ subversion/libsvn_wc/

Modified: subversion/branches/java10-compat/subversion/svn/conflict-callbacks.c URL: http://svn.apache.org/viewvc/subversion/branches/java10-compat/subversion/svn/conflict-callbacks.c?rev=1841179&r1=1841178&r2=1841179&view=diff ==

svn commit: r1841137 - /subversion/branches/1.11.x/STATUS

Author: julianfoad Date: Mon Sep 17 19:49:22 2018 New Revision: 1841137 URL: http://svn.apache.org/viewvc?rev=1841137&view=rev Log: * STATUS: Add r1841136 (test fixup) to r1841091 (SVN-4776: Shelving: remove non-x-prefixed command aliases). Modified: subversion/branches/1.11.x/STATUS Mod

svn commit: r1841136 - in /subversion/trunk/subversion/tests/cmdline/getopt_tests_data: svn--help_stdout svn_help_stdout

Author: julianfoad Date: Mon Sep 17 19:45:31 2018 New Revision: 1841136 URL: http://svn.apache.org/viewvc?rev=1841136&view=rev Log: Fix test expectations, following r1841091. * subversion/tests/cmdline/getopt_tests_data/svn--help_stdout, subversion/tests/cmdline/getopt_tests_data/svn_help_stdou

svn commit: r1841099 - /subversion/branches/1.11.x/STATUS

Author: danielsh Date: Mon Sep 17 17:25:46 2018 New Revision: 1841099 URL: http://svn.apache.org/viewvc?rev=1841099&view=rev Log: * STATUS: Nominate r1841098. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion

svn commit: r1841098 - /subversion/trunk/subversion/svn/svn.c

Author: danielsh Date: Mon Sep 17 17:24:51 2018 New Revision: 1841098 URL: http://svn.apache.org/viewvc?rev=1841098&view=rev Log: * subversion/svn/svn.c: Rename --viewspec to --x-viewspec. See SVN-4776. Modified: subversion/trunk/subversion/svn/svn.c Modified: subversion/trunk/subversion/sv

svn commit: r1841094 - /subversion/branches/1.11.x/STATUS

Author: julianfoad Date: Mon Sep 17 16:53:38 2018 New Revision: 1841094 URL: http://svn.apache.org/viewvc?rev=1841094&view=rev Log: * STATUS: Nominate r1841091. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversi

svn commit: r1841093 - /subversion/branches/java10-compat/build/generator/gen_win.py

Author: jamessan Date: Mon Sep 17 16:51:17 2018 New Revision: 1841093 URL: http://svn.apache.org/viewvc?rev=1841093&view=rev Log: On the 'java10-compat' branch: * build/generator/gen_win.py (get_proj_sources): Format all variables when building TargetJava's build command-line, to make it cle

svn commit: r1841091 - in /subversion/trunk: subversion/svn/svn.c subversion/tests/cmdline/shelf_tests.py tools/client-side/bash_completion

Author: julianfoad Date: Mon Sep 17 16:48:54 2018 New Revision: 1841091 URL: http://svn.apache.org/viewvc?rev=1841091&view=rev Log: Fix SVN-4776: Shelving: remove non-x-prefixed command aliases. Remove the non-x-prefixed aliases such as 'svn shelve', leaving only the 'svn x-shelve' form, because

svn commit: r1841089 - /subversion/site/publish/docs/community-guide/releasing.part.html

Author: danielsh Date: Mon Sep 17 16:32:36 2018 New Revision: 1841089 URL: http://svn.apache.org/viewvc?rev=1841089&view=rev Log: * docs/community-guide/releasing.part.html: Clarify a reference. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/s

svn commit: r1841088 - /subversion/site/publish/docs/community-guide/releasing.part.html

Author: danielsh Date: Mon Sep 17 16:31:07 2018 New Revision: 1841088 URL: http://svn.apache.org/viewvc?rev=1841088&view=rev Log: * docs/community-guide/releasing.part.html: Document r1841085. Modified: subversion/site/publish/docs/community-guide/releasing.part.html Modified: subversion/sit

svn commit: r1841085 - /subversion/trunk/tools/dist/release.py

Author: danielsh Date: Mon Sep 17 16:15:53 2018 New Revision: 1841085 URL: http://svn.apache.org/viewvc?rev=1841085&view=rev Log: release.py: Teach 'clean-dist' about LTS releases. * tools/dist/release.py (supported_release_lines): New. (clean_dist): Update the logic for deciding which artifa

svn commit: r1841084 - /subversion/trunk/subversion/include/svn_client.h

Author: julianfoad Date: Mon Sep 17 16:12:42 2018 New Revision: 1841084 URL: http://svn.apache.org/viewvc?rev=1841084&view=rev Log: Shelving: document that the version number starting from 1. Suggested by: Stefan Kueng * subversion/include/svn_client.h (svn_client_shelf_version_open): Note th

svn commit: r1841083 - /subversion/branches/java10-compat/build/generator/gen_win.py

Author: jamessan Date: Mon Sep 17 16:07:56 2018 New Revision: 1841083 URL: http://svn.apache.org/viewvc?rev=1841083&view=rev Log: On the 'java10-compat' branch: * build/generator/gen_win.py (get_proj_sources): Access headers from Target object rather than Generator Modified: subversion/bra

svn commit: r1841082 - /subversion/trunk/subversion/include/svn_client.h

Author: julianfoad Date: Mon Sep 17 16:07:41 2018 New Revision: 1841082 URL: http://svn.apache.org/viewvc?rev=1841082&view=rev Log: Shelving: Fix Doxygen mark-up. Suggested by: Stefan Kueng * subversion/include/svn_client.h (svn_client_shelf_t, svn_client_shelf_version_t, svn_client_she

svn commit: r1841079 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/shelf.c

Author: julianfoad Date: Mon Sep 17 15:53:33 2018 New Revision: 1841079 URL: http://svn.apache.org/viewvc?rev=1841079&view=rev Log: Shelving: remove deprecated experimental APIs. * subversion/include/svn_client.h, subversion/libbsvn_client/shelf.c (svn_client_shelf_save_new_version2, svn_c

svn commit: r1841062 - /subversion/branches/1.11.x/STATUS

Author: julianfoad Date: Mon Sep 17 10:44:15 2018 New Revision: 1841062 URL: http://svn.apache.org/viewvc?rev=1841062&view=rev Log: * STATUS: Nominate r1841059. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversi

svn commit: r1841059 - /subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c

Author: julianfoad Date: Mon Sep 17 10:27:13 2018 New Revision: 1841059 URL: http://svn.apache.org/viewvc?rev=1841059&view=rev Log: Shelving: fix SVN-4774 "presence of old 1.10 shelves breaks shelf-list". Change the shelves storage dir to be (1) different from the one used by shelving-v1 in svn 1