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

Author: jcorvel Date: Mon Sep 24 21:53:14 2018 New Revision: 1841896 URL: http://svn.apache.org/viewvc?rev=1841896=rev Log: * 1.11.x/STATUS: Upgrade vote for r1841725 group, approving. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

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

Author: danielsh Date: Mon Sep 24 17:16:31 2018 New Revision: 1841877 URL: http://svn.apache.org/viewvc?rev=1841877=rev Log: * tools/dist/release.py: Document r1841085. Modified: subversion/trunk/tools/dist/release.py Modified: subversion/trunk/tools/dist/release.py URL:

svn commit: r1841874 - in /subversion/branches/1.11.x: ./ STATUS subversion/libsvn_client/conflicts.c subversion/tests/libsvn_client/conflicts-test.c

Author: julianfoad Date: Mon Sep 24 16:37:53 2018 New Revision: 1841874 URL: http://svn.apache.org/viewvc?rev=1841874=rev Log: Merge the r1841719 group from trunk: * r1841719, r1841742 Add support for 'local missing' conflicts with directories. Justification: This case already works

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

Author: julianfoad Date: Mon Sep 24 16:26:54 2018 New Revision: 1841873 URL: http://svn.apache.org/viewvc?rev=1841873=rev Log: * STATUS: Approve r1841719 group (support local missing dir conflicts). Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

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

Author: julianfoad Date: Mon Sep 24 16:01:07 2018 New Revision: 1841869 URL: http://svn.apache.org/viewvc?rev=1841869=rev Log: * STATUS: Note that the merge of r1841719 needs '--accept=12'. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

svn commit: r1841868 - in /subversion/branches/1.11.x: ./ CHANGES

Author: julianfoad Date: Mon Sep 24 15:55:20 2018 New Revision: 1841868 URL: http://svn.apache.org/viewvc?rev=1841868=rev Log: * CHANGES: Merge recent change from trunk. Modified: subversion/branches/1.11.x/ (props changed) subversion/branches/1.11.x/CHANGES Propchange:

svn commit: r1841867 - /subversion/trunk/CHANGES

Author: julianfoad Date: Mon Sep 24 15:53:12 2018 New Revision: 1841867 URL: http://svn.apache.org/viewvc?rev=1841867=rev Log: * CHANGES: Updates for 1.11: add Java10 support, tweak a reference, set another optimistic release date. Modified: subversion/trunk/CHANGES Modified:

svn commit: r1841864 - in /subversion/branches/1.11.x: ./ STATUS subversion/libsvn_client/conflicts.c subversion/tests/libsvn_client/conflicts-test.c

Author: julianfoad Date: Mon Sep 24 14:43:12 2018 New Revision: 1841864 URL: http://svn.apache.org/viewvc?rev=1841864=rev Log: Merge the r1841753 group from trunk: * r1841753, r1841754 Fix an assertion failure in the conflict resolver. Justification: Assertions should not get

svn commit: r1841863 - in /subversion/branches/1.11.x: ./ subversion/include/ subversion/include/private/ subversion/libsvn_client/ subversion/svn/

Author: julianfoad Date: Mon Sep 24 14:42:49 2018 New Revision: 1841863 URL: http://svn.apache.org/viewvc?rev=1841863=rev Log: Merge the r1841079 group from trunk: * r1841079,r1841481,r1841567 Move all experimental APIs to the private namespace. Justification: Unblock the 1.11

svn commit: r1841862 - in /subversion/branches/1.11.x: ./ STATUS subversion/svn/svn.c

Author: julianfoad Date: Mon Sep 24 14:42:21 2018 New Revision: 1841862 URL: http://svn.apache.org/viewvc?rev=1841862=rev Log: Merge r1841822 from trunk: * r1841822 Shelving: update the command-line help about the storage directory and say how to recover a 1.10 shelf. Justification:

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

Author: julianfoad Date: Mon Sep 24 14:33:43 2018 New Revision: 1841857 URL: http://svn.apache.org/viewvc?rev=1841857=rev Log: * STATUS: Approve r1841753 group (assertion failure in conflict resolver). Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS

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

Author: julianfoad Date: Mon Sep 24 14:25:21 2018 New Revision: 1841856 URL: http://svn.apache.org/viewvc?rev=1841856=rev Log: * STATUS: Vote for r1841725 (iterpool). Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

svn commit: r1841855 - /subversion/trunk/tools/dist/security/parser.py

Author: danielsh Date: Mon Sep 24 14:22:53 2018 New Revision: 1841855 URL: http://svn.apache.org/viewvc?rev=1841855=rev Log: * tools/dist/security/parser.py (Notification.Metadata.__CULPRITS): Allow 'server' and 'client' to be specified in a tuple, to avoid a mixed-type API (compare

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

Author: rhuijben Date: Mon Sep 24 14:06:49 2018 New Revision: 1841851 URL: http://svn.apache.org/viewvc?rev=1841851=rev Log: * STATUS: Cast vote. Extend nomination. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

svn commit: r1841850 - /subversion/trunk/subversion/svn/conflict-callbacks.c

Author: rhuijben Date: Mon Sep 24 14:05:39 2018 New Revision: 1841850 URL: http://svn.apache.org/viewvc?rev=1841850=rev Log: Remove an unused result_pool argument of private function for conflict handling. * subversion/svn/conflict-callbacks.c (resolve_conflict_interactively): Remove

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

Author: jcorvel Date: Mon Sep 24 13:52:57 2018 New Revision: 1841849 URL: http://svn.apache.org/viewvc?rev=1841849=rev Log: * 1.11.x/STATUS: Vote for r1841822, approving. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

svn commit: r1841844 - /subversion/site/publish/docs/release-notes/1.11.html

Author: julianfoad Date: Mon Sep 24 13:07:48 2018 New Revision: 1841844 URL: http://svn.apache.org/viewvc?rev=1841844=rev Log: * publish/docs/release-notes/1.11.html (shelving): Deduplicate a point; expand jargon. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified:

svn commit: r1841839 - /subversion/site/publish/docs/release-notes/1.11.html

Author: julianfoad Date: Mon Sep 24 12:56:49 2018 New Revision: 1841839 URL: http://svn.apache.org/viewvc?rev=1841839=rev Log: * publish/docs/release-notes/1.11.html (checkpointing): Rewrite to emphasize it's only a part of what checkpointing could ultimately be. Make the command table more

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

Author: brane Date: Mon Sep 24 11:16:26 2018 New Revision: 1841830 URL: http://svn.apache.org/viewvc?rev=1841830=rev Log: * branches/1.11.x/STATUS: Vote for r1841822. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

svn commit: r1841828 - /subversion/site/publish/docs/release-notes/1.11.html

Author: julianfoad Date: Mon Sep 24 10:59:04 2018 New Revision: 1841828 URL: http://svn.apache.org/viewvc?rev=1841828=rev Log: * publish/docs/release-notes/1.11.html (shelving-transition): New section. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified:

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

Author: brane Date: Mon Sep 24 10:47:15 2018 New Revision: 1841827 URL: http://svn.apache.org/viewvc?rev=1841827=rev Log: * branches/1.11.x/STATUS: Approve the r1841731 group. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

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

Author: julianfoad Date: Mon Sep 24 10:15:28 2018 New Revision: 1841823 URL: http://svn.apache.org/viewvc?rev=1841823=rev Log: * STATUS: Nominate r1841822. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL:

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

Author: julianfoad Date: Mon Sep 24 10:11:47 2018 New Revision: 1841822 URL: http://svn.apache.org/viewvc?rev=1841822=rev Log: Shelving: update the command-line help about the storage directory and say how to recover a 1.10 shelf. * subversion/svn/svn.c (svn_cl__cmd_table): Update. Modified:

svn commit: r1841819 - /subversion/site/publish/docs/release-notes/1.11.html

Author: julianfoad Date: Mon Sep 24 09:38:46 2018 New Revision: 1841819 URL: http://svn.apache.org/viewvc?rev=1841819=rev Log: * publish/docs/release-notes/1.11.html (viewspec-output): Update; add detail; add 'experimental' warning. Modified:

svn commit: r1841815 - /subversion/site/publish/docs/release-notes/1.11.html

Author: julianfoad Date: Mon Sep 24 09:10:37 2018 New Revision: 1841815 URL: http://svn.apache.org/viewvc?rev=1841815=rev Log: * publish/docs/release-notes/1.11.html: Change 'shelve' to 'x-shelve' etc. Modified: subversion/site/publish/docs/release-notes/1.11.html Modified:

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

Author: julianfoad Date: Mon Sep 24 08:44:05 2018 New Revision: 1841811 URL: http://svn.apache.org/viewvc?rev=1841811=rev Log: * STATUS: Remove nomination of r1841716,r1841717: they were reverted in r1841807. Modified: subversion/branches/1.11.x/STATUS Modified:

svn commit: r1841809 [2/2] - /subversion/trunk/subversion/po/sv.po

Modified: subversion/trunk/subversion/po/sv.po URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1841809=1841808=1841809=diff == --- subversion/trunk/subversion/po/sv.po [UTF-8] (original) +++

svn commit: r1841807 [1/3] - in /subversion/trunk: subversion/po/sv.po tools/po/po-update.sh

Author: julianfoad Date: Mon Sep 24 08:33:38 2018 New Revision: 1841807 URL: http://svn.apache.org/viewvc?rev=1841807=rev Log: Revert r1841716,r1841717 by agreement of mattiase and stsp. Modified: subversion/trunk/subversion/po/sv.po subversion/trunk/tools/po/po-update.sh

svn commit: r1841807 [2/3] - in /subversion/trunk: subversion/po/sv.po tools/po/po-update.sh

Modified: subversion/trunk/subversion/po/sv.po URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1841807=1841806=1841807=diff == --- subversion/trunk/subversion/po/sv.po [UTF-8] (original) +++

svn commit: r1841807 [3/3] - in /subversion/trunk: subversion/po/sv.po tools/po/po-update.sh

Modified: subversion/trunk/tools/po/po-update.sh URL: http://svn.apache.org/viewvc/subversion/trunk/tools/po/po-update.sh?rev=1841807=1841806=1841807=diff == --- subversion/trunk/tools/po/po-update.sh (original) +++