from:"jamessan"

svn commit: r1913545 - /subversion/branches/1.14.x/STATUS

2023-11-02 Thread jamessan

Author: jamessan
Date: Fri Nov  3 01:40:07 2023
New Revision: 1913545

URL: http://svn.apache.org/viewvc?rev=1913545=rev
Log:
* STATUS: Vote +1 on the r1912724 group, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1913545=1913544=1913545=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Nov  3 01:40:07 2023
@@ -29,13 +29,6 @@ Candidate changes:
Votes:
  +1: dsahlberg, stsp
 
- * r1912724, r1912743
-   Python bindings error handling
-   Justification:
- Improve documentation and error message. Issue #1778
-   Votes:
- +1: dsahlberg
-
  * r1903245
* autogen.sh: export environment variable "PYTHON", for autoheader and
autoconf
@@ -49,3 +42,11 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1912724, r1912743
+   Python bindings error handling
+   Justification:
+ Improve documentation and error message. Issue #1778
+   Votes:
+ +1: dsahlberg, jamessan
+

svn commit: r1913544 - /subversion/branches/1.14.x/STATUS

2023-11-02 Thread jamessan

Author: jamessan
Date: Fri Nov  3 01:29:22 2023
New Revision: 1913544

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

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1913544=1913543=1913544=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Nov  3 01:29:22 2023
@@ -36,6 +36,14 @@ Candidate changes:
Votes:
  +1: dsahlberg
 
+ * r1903245
+   * autogen.sh: export environment variable "PYTHON", for autoheader and
+   autoconf
+   Justification:
+ Build properly when Python executable is not named "python"
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1905169 - /subversion/branches/1.14.x/STATUS

2022-11-08 Thread jamessan

Author: jamessan
Date: Wed Nov  9 01:01:33 2022
New Revision: 1905169

URL: http://svn.apache.org/viewvc?rev=1905169=rev
Log:
* STATUS:
  Vote +1 on r1877310, approving.
  Vote +1 on r1904167, approving.
  Vote +1 on the r1904198 group.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905169=1905168=1905169=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov  9 01:01:33 2022
@@ -15,15 +15,6 @@ Status of 1.14.3:
 Candidate changes:
 ==
 
- * r1877310
-   Add a test for issue #4711 "invalid xml file produced by svn log --xml
-   --verbose --use-merge-history --search".
-   Justification:
- Increase test coverage.
-   Votes:
- +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
- +1: hartmannathan
-
  * r1890223, r1890668, r1890673
Support building on Win64/ARM64.
Justification:
@@ -41,14 +32,6 @@ Candidate changes:
Votes:
  +1: futatuki, jamessan
 
- * r1904167
-   swig-py: Fix conditionals by SWIG version and by Python version for proxy
-   code.
-   Justification:
- swig-py should be built correctly with upcoming SWIG 4.1.0 release.
-   Votes:
- +1: futatuki, jun66j5
-
  * r1904198, r1904287
swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
Justification:
@@ -56,10 +39,28 @@ Candidate changes:
Depends:
  r1878379, r1883719, r1883722, r1884610
Votes:
- +1: futatuki
+ +1: futatuki, jamessan
 
 Veto-blocked changes:
 =
 
 Approved changes:
 =
+
+ * r1877310
+   Add a test for issue #4711 "invalid xml file produced by svn log --xml
+   --verbose --use-merge-history --search".
+   Justification:
+ Increase test coverage.
+   Votes:
+ +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
+ +1: hartmannathan, jamessan
+
+ * r1904167
+   swig-py: Fix conditionals by SWIG version and by Python version for proxy
+   code.
+   Justification:
+ swig-py should be built correctly with upcoming SWIG 4.1.0 release.
+   Votes:
+ +1: futatuki, jun66j5, jamessan
+

svn commit: r1905102 - /subversion/branches/1.14.x/STATUS

2022-11-06 Thread jamessan

Author: jamessan
Date: Sun Nov  6 17:05:40 2022
New Revision: 1905102

URL: http://svn.apache.org/viewvc?rev=1905102=rev
Log:
* STATUS: Vote +1 on the r1878379 group, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905102=1905101=1905102=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Nov  6 17:05:40 2022
@@ -24,14 +24,6 @@ Candidate changes:
  +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
  +1: hartmannathan
 
- * r1878379, r1883719, r1883722, r1884610
-   Distinguish configure scripts on release mode and non release mode.
-   Justification:
- Building process should not be prevented by swig installed in users'
- environment when users use release tar balls.
-   Votes:
- +1: futatuki, stsp
-
  * r1890223, r1890668, r1890673
Support building on Win64/ARM64.
Justification:
@@ -115,3 +107,11 @@ Approved changes:
Votes:
  +1: dsahlberg, jamessan
 
+ * r1878379, r1883719, r1883722, r1884610
+   Distinguish configure scripts on release mode and non release mode.
+   Justification:
+ Building process should not be prevented by swig installed in users'
+ environment when users use release tar balls.
+   Votes:
+ +1: futatuki, stsp, jamessan
+

svn commit: r1905101 - /subversion/branches/1.14.x/STATUS

2022-11-06 Thread jamessan

Author: jamessan
Date: Sun Nov  6 16:56:20 2022
New Revision: 1905101

URL: http://svn.apache.org/viewvc?rev=1905101=rev
Log:
* STATUS:
  Vote +1 on r1900882, approving.
  Vote +1 on r1900890, approving.
  Vote +1 on the 1.14.x-r1903267 branch.
  Vote +1 on r1904193, approving.
  Vote +1 on r1904936, approving.
  Vote +1 on r1904938, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905101=1905100=1905101=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sun Nov  6 16:56:20 2022
@@ -39,27 +39,6 @@ Candidate changes:
votes:
  +1: rhuijben
 
- * r1900882
-   SVN-4899: Replace a call to a function deprecated upstream.
-   Justification:
- No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be
- built by future Python 3.12.  Note that Python 3.2 was released 9 years
- before Subversion 1.14.0.
-   Votes:
- +1: danielsh
- -0: futatuki (This breaks Python 2.7 support;
-   +1 if r1900890 (see below) is also backported)
-
- * r1900890
-   Follow up to r1900882: Restore Python 2.7 support on autogen.sh
-   Justification:
- autogen.sh is need to build SWIG Python 2 bindings.
- We have not actively dropped Python 2.7 support, at least on 1.14.x.
-   Depends:
- r1900882
-   Votes:
- +1: futatuki, jun66j5
-
  * r1903267
Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory
as well as *.pyc
@@ -68,7 +47,7 @@ Candidate changes:
Branch:
  1.14.x-r1903267
Votes:
- +1: futatuki
+ +1: futatuki, jamessan
 
  * r1904167
swig-py: Fix conditionals by SWIG version and by Python version for proxy
@@ -78,14 +57,6 @@ Candidate changes:
Votes:
  +1: futatuki, jun66j5
 
- * r1904193
-   SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t
-   Justification:
- Allow PySVN (and other deprecated API users) to detect working copy
- locked status.
-   Votes:
- +1: hartmannathan, rhuijben
-
  * r1904198, r1904287
swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
Justification:
@@ -95,22 +66,52 @@ Candidate changes:
Votes:
  +1: futatuki
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
+ * r1900882
+   SVN-4899: Replace a call to a function deprecated upstream.
+   Justification:
+ No-op on Python 3.2 and newer, but will allow Subversion 1.14.x to be
+ built by future Python 3.12.  Note that Python 3.2 was released 9 years
+ before Subversion 1.14.0.
+   Votes:
+ +1: danielsh, jamessan
+ -0: futatuki (This breaks Python 2.7 support;
+   +1 if r1900890 (see below) is also backported)
+
+ * r1900890
+   Follow up to r1900882: Restore Python 2.7 support on autogen.sh
+   Justification:
+ autogen.sh is need to build SWIG Python 2 bindings.
+ We have not actively dropped Python 2.7 support, at least on 1.14.x.
+   Depends:
+ r1900882
+   Votes:
+ +1: futatuki, jun66j5, jamessan
+
+ * r1904193
+   SVN-4908: Copy 'locked' from svn_wc_status3_t to svn_wc_status2_t
+   Justification:
+ Allow PySVN (and other deprecated API users) to detect working copy
+ locked status.
+   Votes:
+ +1: hartmannathan, rhuijben, jamessan
+
  * r1904936
Add @Deprecated decorations to avoid compiler warnings.
Justification:
  Avoid some compiler warnings
Votes:
- +1: dsahlberg
+ +1: dsahlberg, jamessan
 
  * r1904938
Java binding fixes.
Justification:
  Don't crash if someone uses a null message
Votes:
- +1: dsahlberg
-
-Veto-blocked changes:
-=
+ +1: dsahlberg, jamessan
 
-Approved changes:
-=

svn commit: r1899264 - /subversion/trunk/tools/dist/backport.pl

2022-03-27 Thread jamessan

Author: jamessan
Date: Sun Mar 27 20:29:22 2022
New Revision: 1899264

URL: http://svn.apache.org/viewvc?rev=1899264=rev
Log:
* tools/dist/backport.pl: Continue chasing the experimental nature of 'given'
and 'when', through perl5340delta.

Modified:
subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1899264=1899263=1899264=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sun Mar 27 20:29:22 2022
@@ -9,11 +9,11 @@ use v5.10.0; # needed for $^V
 # experimental and "subject to change" in v5.18 (see perl5180delta).  Every
 # use of it now triggers a warning.
 #
-# As of Perl v5.30.0, the semantics of given/when provided by Perl are
+# As of Perl v5.34.0, the semantics of given/when provided by Perl are
 # compatible with those expected by the script, so disable the warning for
 # those Perls.  But don't try to disable the the warning category on Perls
 # that don't know that category, since that breaks compilation.
-no if (v5.17.0 le $^V and $^V le v5.30.0),
+no if (v5.17.0 le $^V and $^V le v5.34.0),
warnings => 'experimental::smartmatch';
 
 # Licensed to the Apache Software Foundation (ASF) under one

svn commit: r1899263 - /subversion/trunk/tools/dist/backport.pl

2022-03-27 Thread jamessan

Author: jamessan
Date: Sun Mar 27 20:19:24 2022
New Revision: 1899263

URL: http://svn.apache.org/viewvc?rev=1899263=rev
Log:
* tools/dist/backport.pl
  (parse_entry): Reverse "$var =~ m/../ or defined $var" checks so undefined
   values aren't matched against

Modified:
subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1899263=1899262=1899263=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sun Mar 27 20:19:24 2022
@@ -591,10 +591,10 @@ sub parse_entry {
   # summary
   do {
 push @logsummary, shift
-  } until $_[0] =~ /^\s*[A-Z][][\w]*:/ or not defined $_[0];
+  } until not defined $_[0] or $_[0] =~ /^\s*[A-Z][][\w]*:/;
 
   # votes
-  unshift @votes, pop until $_[-1] =~ /^\s*Votes:/ or not defined $_[-1];
+  unshift @votes, pop until not defined $_[-1] or $_[-1] =~ /^\s*Votes:/;
   pop;
 
   # depends, branch, notes

svn commit: r1898634 - /subversion/branches/1.14.x/STATUS

2022-03-05 Thread jamessan

Author: jamessan
Date: Sat Mar  5 20:32:50 2022
New Revision: 1898634

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

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1898634=1898633=1898634=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Mar  5 20:32:50 2022
@@ -138,6 +138,13 @@ Candidate changes:
Votes:
  +1: jun66j5
 
+ * r1898633
+   Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
+   Justification:
+ Fix test failure
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1898633 - /subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

2022-03-05 Thread jamessan

Author: jamessan
Date: Sat Mar  5 20:29:42 2022
New Revision: 1898633

URL: http://svn.apache.org/viewvc?rev=1898633=rev
Log:
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
  (testCrash_RequestChannel_nativeRead_AfterException): Ignore IOException to
avoid a false positive test failure if WAIT_TUNNEL tries to read after the
pipe is already closed.

Patch by: Alexandr Miloslavskiy 

Modified:

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

Modified: 
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1898633=1898632=1898633=diff
==
--- 
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
 Sat Mar  5 20:29:42 2022
@@ -4676,7 +4676,20 @@ public class BasicTests extends SVNTests
 // RuntimeException("Test exception") is expected here
 }
 
-tunnelAgent.joinAndTest();
+// In this test, there is a race condition that sometimes results in
+// IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+// already has its read end closed. This is not an error, but
+// it's hard to distinguish this case from other IOException which
+// indicate a problem. To reproduce, simply wrap this test's body in
+// a loop. The workaround is to ignore any detected IOException.
+try
+{
+tunnelAgent.join();
+}
+catch (InterruptedException e)
+{
+e.printStackTrace();
+}
 }
 
 /**

svn commit: r1886280 - /subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp

2021-02-07 Thread jamessan

Author: jamessan
Date: Sun Feb  7 15:11:49 2021
New Revision: 1886280

URL: http://svn.apache.org/viewvc?rev=1886280=rev
Log:
* 
subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
  (Java_org_apache_subversion_javahl_util_SubstLib_translateOutputStream):
   Specify correct method name, translateOutputStream, in JNI setup.

Modified:

subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp

Modified: 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp?rev=1886280=1886279=1886280=diff
==
--- 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
 Sun Feb  7 15:11:49 2021
@@ -195,7 +195,7 @@ Java_org_apache_subversion_javahl_util_S
 jstring jurl, jstring jrepos_root_url,
 jobject jdate, jstring jauthor)
 {
-  SVN_JAVAHL_JNI_TRY(SubstLib, translateInputStream)
+  SVN_JAVAHL_JNI_TRY(SubstLib, translateOutputStream)
 {
   const Java::Env env(jenv);

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

2021-01-26 Thread jamessan

Author: jamessan
Date: Wed Jan 27 02:09:41 2021
New Revision: 1885926

URL: http://svn.apache.org/viewvc?rev=1885926=rev
Log:
* STATUS: Vote +1 on the r1874850 group, approving.

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=1885926=1885925=1885926=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Jan 27 02:09:41 2021
@@ -39,13 +39,6 @@ Candidate changes:
Votes:
  +1: stsp, jamessan
 
- * r1874850, r1885795
-   Update copyright year to 2020 and then to 2021.
-   Justification:
- The future is here!
-   Votes:
- +1: stsp, jcorvel
-
  * r1875602
Remove incorrect include paths from svn_cv_ruby_includes.
Justification:
@@ -89,3 +82,11 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1874850, r1885795
+   Update copyright year to 2020 and then to 2021.
+   Justification:
+ The future is here!
+   Votes:
+ +1: stsp, jcorvel, jamessan
+

svn commit: r1885925 - /subversion/branches/1.14.x/STATUS

2021-01-26 Thread jamessan

Author: jamessan
Date: Wed Jan 27 02:06:37 2021
New Revision: 1885925

URL: http://svn.apache.org/viewvc?rev=1885925=rev
Log:
* STATUS: Vote +1 on r1877794, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1885925=1885924=1885925=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Jan 27 02:06:37 2021
@@ -23,14 +23,6 @@ Candidate changes:
Votes:
  +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
 
- * r1877794
-   Use Doxygen comment leader for comments with doxygen syntax.
-   Justification:
- Improve $EDITOR's syntax highlighting.
-   Votes:
- +0: danielsh
- +1: brane
-
  * r1883355
Use the APR-1.4+ API for flushing file contents to disk.
Justification:
@@ -60,3 +52,12 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1877794
+   Use Doxygen comment leader for comments with doxygen syntax.
+   Justification:
+ Improve $EDITOR's syntax highlighting.
+   Votes:
+ +0: danielsh
+ +1: brane, jamessan
+

svn commit: r1881073 - /subversion/branches/1.14.x/STATUS

2020-08-21 Thread jamessan

Author: jamessan
Date: Sat Aug 22 03:34:12 2020
New Revision: 1881073

URL: http://svn.apache.org/viewvc?rev=1881073=rev
Log:
* STATUS: Nominate r1878855, r1878859.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1881073=1881072=1881073=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Aug 22 03:34:12 2020
@@ -32,6 +32,13 @@ Candidate changes:
Votes:
  +1: julianfoad, hartmannathan
 
+ * r1878855, r1878859
+   Make the hot-backup.py script work with Python 3.
+   Justification:
+ Script should work with Python3
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1881072 - /subversion/branches/1.14.x/STATUS

2020-08-21 Thread jamessan

Author: jamessan
Date: Sat Aug 22 03:20:18 2020
New Revision: 1881072

URL: http://svn.apache.org/viewvc?rev=1881072=rev
Log:
* STATUS: Approve r1880886.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1881072=1881071=1881072=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Aug 22 03:20:18 2020
@@ -32,6 +32,12 @@ Candidate changes:
Votes:
  +1: julianfoad, hartmannathan
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
  * r1880886
Fix crash in JavaHL JNI wrapper caused by object lifetimes
Justification:
@@ -39,8 +45,3 @@ Candidate changes:
Votes:
  +1: hartmannathan, jamessan
 
-Veto-blocked changes:
-=
-
-Approved changes:
-=

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

2020-08-21 Thread jamessan

Author: jamessan
Date: Sat Aug 22 03:16:51 2020
New Revision: 1881071

URL: http://svn.apache.org/viewvc?rev=1881071=rev
Log:
* STATUS: Approve r1880886.

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=1881071=1881070=1881071=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Aug 22 03:16:51 2020
@@ -90,6 +90,12 @@ Candidate changes:
Votes:
  +1: julianfoad
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
  * r1880886
Fix crash in JavaHL JNI wrapper caused by object lifetimes
Justification:
@@ -97,8 +103,3 @@ Candidate changes:
Votes:
  +1: hartmannathan, jamessan
 
-Veto-blocked changes:
-=
-
-Approved changes:
-=

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

2020-08-16 Thread jamessan

Author: jamessan
Date: Mon Aug 17 03:02:51 2020
New Revision: 1880915

URL: http://svn.apache.org/viewvc?rev=1880915=rev
Log:
* STATUS: Vote +1 on r1880886.

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=1880915=1880914=1880915=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Aug 17 03:02:51 2020
@@ -95,7 +95,7 @@ Candidate changes:
Justification:
  Fixes a crash encountered with GCC 10.
Votes:
- +1: hartmannathan
+ +1: hartmannathan, jamessan
 
 Veto-blocked changes:
 =

svn commit: r1880914 - /subversion/branches/1.14.x/STATUS

2020-08-16 Thread jamessan

Author: jamessan
Date: Mon Aug 17 03:00:37 2020
New Revision: 1880914

URL: http://svn.apache.org/viewvc?rev=1880914=rev
Log:
* STATUS:
  Vote +1 on the 1.14.x-r1880374-fsfs branch, approving.
  Vote +1 on r1880886.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1880914=1880913=1880914=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Aug 17 03:00:37 2020
@@ -32,24 +32,25 @@ Candidate changes:
Votes:
  +1: julianfoad, hartmannathan
 
- * r1880374:subversion/libsvn_fs_fs
-   Fix an uninitialized read in svn_fs_fs__index_append().
-   Justification:
- Uninitialized reads are potentially undefined behaviour.
-   Branch:
- 1.14.x-r1880374-fsfs
-   Votes:
- +1: danielsh, hartmannathan
-
  * r1880886
Fix crash in JavaHL JNI wrapper caused by object lifetimes
Justification:
  Fixes a crash encountered with GCC 10.
Votes:
- +1: hartmannathan
+ +1: hartmannathan, jamessan
 
 Veto-blocked changes:
 =
 
 Approved changes:
 =
+
+ * r1880374:subversion/libsvn_fs_fs
+   Fix an uninitialized read in svn_fs_fs__index_append().
+   Justification:
+ Uninitialized reads are potentially undefined behaviour.
+   Branch:
+ 1.14.x-r1880374-fsfs
+   Votes:
+ +1: danielsh, hartmannathan, jamessan
+

svn commit: r1879786 - /subversion/branches/1.14.x/STATUS

2020-07-11 Thread jamessan

Author: jamessan
Date: Sat Jul 11 14:03:18 2020
New Revision: 1879786

URL: http://svn.apache.org/viewvc?rev=1879786=rev
Log:
* STATUS:
  Vote +1 on r1876410, approving.
  Vote +1 on r1878413, approving.
  Vote +1 on the r1878909 group, approving.
  Vote +1 on r1879198, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1879786=1879785=1879786=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jul 11 14:03:18 2020
@@ -15,27 +15,41 @@ Status of 1.14.1:
 Candidate changes:
 ==
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
+ * r1877960
+   * INSTALL (I.C.12): Add Note that non-release mode is required for building
+ SWIG Python 2 bindings.
+   Justification:
+ We've not entirely dropped Python 2 bindings support on 1.14.x yet
+   Votes:
+ +1: futatuki, stsp, rhuijben
+
  * r1876410
Fix the .editorconfig stanza for Makefile's.
Justification:
  Make $EDITOR do the right thing on any backport branches we may create
  off this stabilization branch.
Votes:
- +1: danielsh, stsp
+ +1: danielsh, stsp, jamessan
 
  * r1878413
autogen.sh: Remove per SWIG bindings checked files on release mode.
Justification:
  The release tarballs should not contain .swig_*_checked files
Votes:
- +1: futatuki, rhuijben
+ +1: futatuki, rhuijben, jamessan
 
  * r1878909, r1878918, r1878950
Fix a number of thinkos in human-readable file size formatting.
Justification:
  Fixes wrong output and an assertion failure in debug mode.
Votes:
- +1: brane, rhuijben
+ +1: brane, rhuijben, jamessan
 
  * r1879198
Fix an invalid quoting in working copy upgrade system that only works
@@ -47,18 +61,5 @@ Candidate changes:
  This filechange by itself doesn't trigger a change that make will
  handle. So make sure you recompile the sql queries for testing.
Votes:
- +1: rhuijben, danielsh
+ +1: rhuijben, danielsh, jamessan
 
-Veto-blocked changes:
-=
-
-Approved changes:
-=
-
- * r1877960
-   * INSTALL (I.C.12): Add Note that non-release mode is required for building
- SWIG Python 2 bindings.
-   Justification:
- We've not entirely dropped Python 2 bindings support on 1.14.x yet
-   Votes:
- +1: futatuki, stsp, rhuijben

svn commit: r1878457 - /subversion/site/publish/docs/release-notes/index.html

2020-06-03 Thread jamessan

Author: jamessan
Date: Thu Jun  4 02:30:48 2020
New Revision: 1878457

URL: http://svn.apache.org/viewvc?rev=1878457=rev
Log:
* docs/release-notes/index.html
  (#release-notes-list): Add release date for 1.14

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

Modified: subversion/site/publish/docs/release-notes/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/index.html?rev=1878457=1878456=1878457=diff
==
--- subversion/site/publish/docs/release-notes/index.html (original)
+++ subversion/site/publish/docs/release-notes/index.html Thu Jun  4 02:30:48 
2020
@@ -47,7 +47,7 @@ official support status for the various
 Here are the release notes for the major Subversion releases: 
 
 
-Subversion 1.14 â in progress
+Subversion 1.14 â (first released - May 27, 
2020)
 Subversion 1.13 â (first released â October 
30, 2019)
 Subversion 1.12 â (first released â April 
24, 2019)
 Subversion 1.11 â Improved shelving, 
checkpointing, improved tree conflict resolution (first released â October 
30, 2018)

svn commit: r39784 - in /dev/subversion: subversion-1.14.0.tar.bz2.asc subversion-1.14.0.tar.gz.asc

2020-05-26 Thread jamessan

Author: jamessan
Date: Wed May 27 01:24:18 2020
New Revision: 39784

Log:
Add my signatures for 1.14.0

Modified:
dev/subversion/subversion-1.14.0.tar.bz2.asc
dev/subversion/subversion-1.14.0.tar.gz.asc

Modified: dev/subversion/subversion-1.14.0.tar.bz2.asc
==
--- dev/subversion/subversion-1.14.0.tar.bz2.asc (original)
+++ dev/subversion/subversion-1.14.0.tar.bz2.asc Wed May 27 01:24:18 2020
@@ -56,3 +56,21 @@ OfaJ33xSJed3UuUsayQkL9ejxu9TaqRnbHEc7iwq
 rLtQ/BL2SBTyCiPb9ovC7Zbom3/99Wge5j22S82SJEou5xlL6Eo=
 =4Pw3
 -END PGP SIGNATURE-
+-BEGIN PGP SIGNATURE-
+
+iQKTBAABCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAl7NwHtfFIAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
+QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
+o9twGg/+NtsaVN5xEukRMCv5zYmcLzdmW5ZTWZCeP39wT4sR5Y7VQaAb1QHQS2OV
+Li3LNl1k3NPJRNcW8ANNz0bjhsARoLft9H5fqHaz1g1XwgJJFOpDdsT//FrDVA2g
+beM4iHyPpMQjx/9c5E4OFumbwHnc/vbegMI7moRHDkS+Vlu2g2gJAFCtIJ9eblYT
+5l/llzgupZYDvQig30gi29wcBypu7EbsMaCVXnqDzq7RBuAlaJYccGjmkE5h/KuN
+/yWxYoluh8AExzhB7Mp7g87CuY4tIwohX0LGifoCUqb1hA9S30XLWQ4Kfx67ryIf
+Kge5svOQkjCFylUSv79t9Y3HlMa3CrB6R2miYYMnAAzSbf/2eYFdNhVjjQaTi18h
+k3rl+VwYwlg+S0iAK+TwSNNUuf5XbcHmaZ7LuGXIyFXLklAWzi0MvnKeNMA5TmvT
+xx1riUd1bIF+nGGNeZUoG6kJ+6cx/V2WNLGuFVNdzDFZECD4k1xiVSNxHLpD2vk2
+FYHp89VmUpvjB396yPWc8eW2TrfFuEufKPXVymfNWxZWWUrckd6Va2csuACtx8mZ
+W1d+Cvr5yh0F667ucyLzKSdw80jM0MDfs164RvzIPp/LdU/juQxFFxI7LLG8avKc
+E8CYpFHe5rEAAyWW0IMIjVoYGPzOfuaE+SgRFGPGqszMNKt9vZM=
+=ZjJu
+-END PGP SIGNATURE-

Modified: dev/subversion/subversion-1.14.0.tar.gz.asc
==
--- dev/subversion/subversion-1.14.0.tar.gz.asc (original)
+++ dev/subversion/subversion-1.14.0.tar.gz.asc Wed May 27 01:24:18 2020
@@ -56,3 +56,21 @@ flQOWt7xoEuWH1N4/juqHPA5YVnD8gYrZE9RrioR
 GvReDrtt3M48WrROJcAWdMybw1MjrhwVYs45RS211CY/SwVpvC0=
 =7Lee
 -END PGP SIGNATURE-
+-BEGIN PGP SIGNATURE-
+
+iQKTBAABCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAl7NwGhfFIAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
+QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
+o9vo+xAAwUtiK2FYOBg0fuq45YARMmtcDASkRxImgW5SSntqxuVCIekkji6kfJ9/
+W14+haA5HPNuwpAKrsn30pRor2wyydNrvh8CetuWRMbSgv6LFXMquiRZA//Kkbi1
+f5jXJGfmGy2aQzK9+fmeNSaoJIr9625YuufeqS0ydOxRjMsz/KXuIWnXg6vnj5td
+umuxtCUOPxobSOuySKJbb3KMRvZk39Axw9355rzcFldapQ0WneMY7eip6Y4CDXgj
+cH33DA4hj7eR0X43eLSmU9EKvGXctGdxCl1iPo3H8XJH7DaEMQvn5g2t/8cq1zNG
+YTHhZS+sUtbIMLf+RlmNvE2ZnzUebW6PKJDbuKBQjI/fsCIztlFndaYL0BDIaku1
+/N8o3CVmfgWgJvfdPc70U5giaUQ8lfN4gAlrtWXvkSyYUtYrHenh4rvQ1TxWNlCO
+mPxmZ5JpHOsGQOLGQP2DQkrD8oW8w1PrppCQv5HUC7tJM9D8VUEgLuxxrrneLyUD
+zT8zmCqCNVz4ByCkrBCZN7bPH8/99ELkFjVW3yu34ukPOCVSdZOyWapM/VBWcquF
+410pR6T7umnhjDH2Pq3BOOBn1PLGBlruN7qzZRpi467g5Tpr/YTSKf1z/xkOhwUA
+CEtd2hqXqGBYTYbY5aM38VeSFvigZm8ofmIUbXZZN8B+rZ21xcg=
+=aY74
+-END PGP SIGNATURE-

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

2020-05-09 Thread jamessan

Author: jamessan
Date: Sat May  9 18:41:19 2020
New Revision: 1877539

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

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=1877539=1877538=1877539=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat May  9 18:41:19 2020
@@ -53,6 +53,13 @@ Candidate changes:
Votes:
  +1: stsp
 
+ * r1875602
+   Remove incorrect include paths from svn_cv_ruby_includes.
+   Justification:
+ Fixes building with latest Ruby
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r38879 - in /dev/subversion: subversion-1.14.0-rc2.tar.bz2.asc subversion-1.14.0-rc2.tar.gz.asc

2020-04-09 Thread jamessan

Author: jamessan
Date: Fri Apr 10 03:49:19 2020
New Revision: 38879

Log:
Add my signatures for 1.14.0-rc2

Modified:
dev/subversion/subversion-1.14.0-rc2.tar.bz2.asc
dev/subversion/subversion-1.14.0-rc2.tar.gz.asc

Modified: dev/subversion/subversion-1.14.0-rc2.tar.bz2.asc
==
--- dev/subversion/subversion-1.14.0-rc2.tar.bz2.asc (original)
+++ dev/subversion/subversion-1.14.0-rc2.tar.bz2.asc Fri Apr 10 03:49:19 2020
@@ -8,3 +8,21 @@ Cbfve70SG/AoUKBazpfejSHaYKdsXypI4YxUgilL
 j4RVu3mEKbDpWZcF7nuZApQ+GFw+1vhDx+t4Sp9qchoEdyO+OzK3AzeMqSoBq40=
 =XpyL
 -END PGP SIGNATURE-
+-BEGIN PGP SIGNATURE-
+
+iQKTBAABCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAl6P6tFfFIAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
+QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
+o9vUOhAAnzm6xR9Wklv4SK3OSUzWLCWAnSV2BR1p4XFiIHuh6slWD1EK8F6mfwQr
+F/y9Td+93XsLVPpimlLF33b4eVP+ep0Ss5C3rKOArFb90hnAB6x7Zn5TrYPvDn9P
+6hMY1/xu6+2gK57w+pF9KU5HK3EXdh1jHp2EIQdBZNyyerz/+NiKWlqLlAOo/ldt
+0jnHrJmBrzZuh3jbJEDSaqRDi7oZjtePWZ/keM1oEQrDgjhzuHlu5djQA/utS8+r
+WVU+nrL/BtycaNOL982nwvVHL5W7tEx8eitV5I9Va0iJ+z57BTZ7FONKPUojVIgE
+yws58dPvEpkow5A4JDvsO53Gl2+hT8U9o72HZMuK6CQ4C4NZKtL2L59meGJTD4HP
+YcsEgZ2SOBKOxhCX+0ikmoSait/MVx8Cp46WLqIP/G0nDMk50R5jelv0MBP2Au/j
+4cEa9qdBjp2+w+pk51l9ukAEZTIDhUMYFJHVIkgZ/a/nK1xwDU2dLohX4n/Sjx7+
+Ich2lsayuzkk4o4utNJqojZugV0H76cCMmsIhHG7lirqxvCbQ4QHocx+m4EBHfOp
+5nCY+3+AMWWu7tlVOWvWRVP4dJuuOYK6b4mcLZgs8RzC6u+JbcTb14EaQS6hDJHq
+k2U+tgrC3QbYz72EkSHZQ98cBUgzPFcVsAmh7huk/hVudVFCviE=
+=pn+N
+-END PGP SIGNATURE-

Modified: dev/subversion/subversion-1.14.0-rc2.tar.gz.asc
==
--- dev/subversion/subversion-1.14.0-rc2.tar.gz.asc (original)
+++ dev/subversion/subversion-1.14.0-rc2.tar.gz.asc Fri Apr 10 03:49:19 2020
@@ -8,3 +8,21 @@ dXU1B/OKKeErRtfBRL71xfw08AWvpr6zkC9M0KyJ
 4lKps1LuIXhOvWkuJOW1Fy2aSO0Z5sbru/m7WP6fzKUwxGz+/QrT3tJmWZMr+aU=
 =az5J
 -END PGP SIGNATURE-
+-BEGIN PGP SIGNATURE-
+
+iQKTBAABCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAl6P6tBfFIAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
+QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
+o9ssuw//deK/c7ZUKRh/27rdOfPUSLly/NhufAAAKhQgmFT2Qe9LpRxfZKUZxnND
+Z0R87gw+ULrJli/EfXSzmxO5Amz5s7LkPaVYb6zXAxI2dNXjNFxb7b3gWTV+cM/d
+ALiQkeSejz3TU8F0pKtGeux9uENG6PSRvpGquLES45sAH7NXnQ3XXG1VViDUegIF
+Fp3qYusK+7uBXebpBN9EXfyj1hmCdtBZOdcawXOTafcsQWTmuqkxnvkSL4OOV9Zd
+NJHOZ/An81aPgsynkfNGYRUwHXKGB77HwAZk4PG0lNMuucmSwgR/HZsYMM5PB02E
+fmf/AIVvy54lzhJwLTRNo8cgxyR8rkRbcjJyhAiPzAkR66vtUMo6oV1TbHUtT1fB
+HQqTwW0cjId0U+3oAYg9miwTwatjoMQN3tSgLH7QTQPGkfq/MEl+RV3jNtwQVrcx
+FWKh9wPJH1S6EuMP+35YtPy61TMPv2FF9KwGssVqjJ9k7o3v2Dn/IagaS/Nqqfzy
+aR7lvf6xjzbftAb2iWwJB7L244yv7/YHZR/48+FARddQ8WWE3N+vgWHi1gl5daQW
+XhOuGoBY+yT9C3Mf+BKqXgFEuuyW+//LALRNmH1TTC9sZbI4si9pOBPbOoALD77i
+E/quDKjX1jIwrpyPIDTraUpwlJp33nazjba8bBbvYHmT2tpYiP4=
+=ZW25
+-END PGP SIGNATURE-

svn commit: r1876069 - /subversion/branches/1.14.x/STATUS

2020-04-02 Thread jamessan

Author: jamessan
Date: Fri Apr  3 00:42:37 2020
New Revision: 1876069

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

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876069=1876068=1876069=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Apr  3 00:42:37 2020
@@ -29,6 +29,14 @@ Candidate changes:
Votes:
 +1: stsp, jamessan
 
+ * r1876068
+   Add libsvn_shelf.h and libsvn_shelf2.h to msvc-export, needed for the
+   private symbols
+   Justification:
+ Fix shelf-cmd/shelf2-cmd link errors for svn on Windows
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1876068 - /subversion/trunk/build.conf

2020-04-02 Thread jamessan

Author: jamessan
Date: Fri Apr  3 00:37:15 2020
New Revision: 1876068

URL: http://svn.apache.org/viewvc?rev=1876068=rev
Log:
* build.conf
  (libsvn_client): Add libsvn_shelf.h and libsvn_shelf2.h to msvc-export,
   needed for the private symbols

Modified:
subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1876068=1876067=1876068=diff
==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri Apr  3 00:37:15 2020
@@ -248,7 +248,7 @@ type = lib
 path = subversion/libsvn_client
 libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
 install = lib
-msvc-export = svn_client.h private/svn_client_mtcc.h 
private/svn_client_private.h
+msvc-export = svn_client.h private/svn_client_mtcc.h 
private/svn_client_private.h private/svn_client_shelf.h 
private/svn_client_shelf2.h
 
 # Routines for binary diffing and tree-deltas
 [libsvn_delta]

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

2020-04-02 Thread jamessan

Author: jamessan
Date: Thu Apr  2 23:43:33 2020
New Revision: 1876066

URL: http://svn.apache.org/viewvc?rev=1876066=rev
Log:
* STATUS:
  Vote +1 on r1875726.
  Vote +1 on r1876054.

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=1876066=1876065=1876066=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Apr  2 23:43:33 2020
@@ -37,14 +37,14 @@ Candidate changes:
Justification:
  release.py didn't catch this error when 1.14.0-rc1 release was created
Votes:
- +1: stsp
+ +1: stsp, jamessan
 
  * r1876054
Fix undefined behavior when constructing ID for txn_node_cache in fsfs.
Justification:
  Fixes potential crash in apr_pstrcat(). Pretty obvious fix.
Votes:
-+1: stsp
++1: stsp, jamessan
 
 Veto-blocked changes:
 =

svn commit: r1876065 - /subversion/branches/1.14.x/STATUS

2020-04-02 Thread jamessan

Author: jamessan
Date: Thu Apr  2 23:26:42 2020
New Revision: 1876065

URL: http://svn.apache.org/viewvc?rev=1876065=rev
Log:
* STATUS:
  Vote +1 on the r1876016 group, approving.
  Vote +1 on r1876054.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876065=1876064=1876065=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Apr  2 23:26:42 2020
@@ -22,21 +22,12 @@ Candidate changes:
Votes:
  +1: jamessan, stsp
 
- * r1876016, r1876050
-   Explain SWIG is needed for building Python 2 bindings.
-   Justification:
- Target of Python bindings SWIG-generated source code in the distribution
- tarballs will switch to Python 3 in 1.14.0, however we still allow to
- build bindings for Python 2
-   Votes:
- +1: futatuki, hartmannathan
-
  * r1876054
Fix undefined behavior when constructing ID for txn_node_cache in fsfs.
Justification:
  Fixes potential crash in apr_pstrcat(). Pretty obvious fix.
Votes:
-+1: stsp
++1: stsp, jamessan
 
 Veto-blocked changes:
 =
@@ -81,3 +72,12 @@ Approved changes:
  +1: stsp, cmpilato, jamessan
  +0: danielsh (without r1875973, r1876010)
 
+ * r1876016, r1876050
+   Explain SWIG is needed for building Python 2 bindings.
+   Justification:
+ Target of Python bindings SWIG-generated source code in the distribution
+ tarballs will switch to Python 3 in 1.14.0, however we still allow to
+ build bindings for Python 2
+   Votes:
+ +1: futatuki, hartmannathan, jamessan
+

svn commit: r1876046 - /subversion/branches/1.14.x/STATUS

2020-04-02 Thread jamessan

Author: jamessan
Date: Thu Apr  2 12:19:42 2020
New Revision: 1876046

URL: http://svn.apache.org/viewvc?rev=1876046=rev
Log:
* STATUS
  Vote +1 on r1875918, approving.
  Vote +1 on the r1875921 group, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876046=1876045=1876046=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Apr  2 12:19:42 2020
@@ -15,23 +15,6 @@ Status of 1.14.0:
 Candidate changes:
 ==
 
- * r1875918
-   rep-cache.db insert optimization
-   Justification:
- Small performance optimization.
-   Votes:
- +1: stsp, cmpilato
-
- * r1875921, r1875925, r1875973, r1876010
-   Introduce 'svnadmin build-repcache' command.
-   Justification:
- Low-risk and useful feature addition. It would be nice to get this
- merged in time for 1.14.0. Else this would have to wait until 1.15.0.
-   Votes:
- +1: stsp, cmpilato
- +0: danielsh (without r1875973, r1876010)
- -0: danielsh (Missing docstrings: 
https://mail-archives.apache.org/mod_mbox/subversion-dev/202003.mbox/%3C20200331092329.580085e0%40tarpaulin.shahaf.local2%3E)
-
  * r1876020
Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7
Justification:
@@ -66,3 +49,19 @@ Approved changes:
Votes:
  +1: stsp, jamessan, cmpilato
 
+ * r1875918
+   rep-cache.db insert optimization
+   Justification:
+ Small performance optimization.
+   Votes:
+ +1: stsp, cmpilato, jamessan
+
+ * r1875921, r1875925, r1875973, r1876010
+   Introduce 'svnadmin build-repcache' command.
+   Justification:
+ Low-risk and useful feature addition. It would be nice to get this
+ merged in time for 1.14.0. Else this would have to wait until 1.15.0.
+   Votes:
+ +1: stsp, cmpilato, jamessan
+ +0: danielsh (without r1875973, r1876010)
+

svn commit: r1876045 - /subversion/branches/1.14.x/STATUS

2020-04-02 Thread jamessan

Author: jamessan
Date: Thu Apr  2 12:09:34 2020
New Revision: 1876045

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

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876045=1876044=1876045=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Apr  2 12:09:34 2020
@@ -32,6 +32,13 @@ Candidate changes:
  +0: danielsh (without r1875973, r1876010)
  -0: danielsh (Missing docstrings: 
https://mail-archives.apache.org/mod_mbox/subversion-dev/202003.mbox/%3C20200331092329.580085e0%40tarpaulin.shahaf.local2%3E)
 
+ * r1876020
+   Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7
+   Justification:
+ Tests should pass cleanly against latest upstream
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1876020 - in /subversion/trunk/subversion/bindings/swig/ruby/svn: client.rb core.rb

2020-04-01 Thread jamessan

Author: jamessan
Date: Thu Apr  2 03:01:43 2020
New Revision: 1876020

URL: http://svn.apache.org/viewvc?rev=1876020=rev
Log:
Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7

Per Ruby 2.7's release notes[1], use the block-capturing syntax instead of
explicit Proc.new to resolve warnings like these in the Ruby SWIG APIs:

subversion/bindings/swig/ruby/svn/client.rb:640: warning: Capturing the given 
block using Proc.new is deprecated; use `` instead
subversion/bindings/swig/ruby/svn/core.rb:258: warning: Capturing the given 
block using Proc.new is deprecated; use `` instead

[1]: 
https://github.com/ruby/ruby/blob/v2_7_0/NEWS#proclambda-without-block-is-deprecated-

* subversion/bindings/swig/ruby/svn/client.rb:
  (set_log_msg_func, set_log_msg_func2, set_notify_func, set_cancel_func):
   Replace callback=Proc.new parameter with 
  (def_init_callbacks): Remove explicit nil parameters to above functions,
   leveraging deafaults

* subversion/bindings/swig/ruby/svn/core.rb:
  (add_simple_prompt_provider, add_username_prompt_provider,
   add_ssl_server_trust_prompt_provider, add_ssl_client_cert_prompt_provider,
   add_ssl_client_cert_pw_prompt_provider): Replace prompt=Proc.new parameter
with 

Modified:
subversion/trunk/subversion/bindings/swig/ruby/svn/client.rb
subversion/trunk/subversion/bindings/swig/ruby/svn/core.rb

Modified: subversion/trunk/subversion/bindings/swig/ruby/svn/client.rb
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/svn/client.rb?rev=1876020=1876019=1876020=diff
==
--- subversion/trunk/subversion/bindings/swig/ruby/svn/client.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/svn/client.rb Thu Apr  2 
03:01:43 2020
@@ -637,25 +637,25 @@ module Svn
ignore_externals, allow_unver_obstruction, self)
   end
 
-  def set_log_msg_func(callback=Proc.new)
+  def set_log_msg_func()
 callback_wrapper = Proc.new do |items|
   items = items.collect do |item|
 item_wrapper = CommitItemWrapper.new(item)
   end
   callback.call(items)
 end
-set_log_msg_func2(callback_wrapper)
+set_log_msg_func2(_wrapper)
   end
 
-  def set_log_msg_func2(callback=Proc.new)
+  def set_log_msg_func2()
 @log_msg_baton = Client.set_log_msg_func3(self, callback)
   end
 
-  def set_notify_func(callback=Proc.new)
+  def set_notify_func()
 @notify_baton = Client.set_notify_func2(self, callback)
   end
 
-  def set_cancel_func(callback=Proc.new)
+  def set_cancel_func()
 @cancel_baton = Client.set_cancel_func(self, callback)
   end
 
@@ -707,9 +707,9 @@ module Svn
 
   private
   def init_callbacks
-set_log_msg_func(nil)
-set_notify_func(nil)
-set_cancel_func(nil)
+set_log_msg_func
+set_notify_func
+set_cancel_func
   end
   %w(log_msg notify cancel).each do |type|
 private "#{type}_func", "#{type}_baton"

Modified: subversion/trunk/subversion/bindings/swig/ruby/svn/core.rb
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/svn/core.rb?rev=1876020=1876019=1876020=diff
==
--- subversion/trunk/subversion/bindings/swig/ruby/svn/core.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/svn/core.rb Thu Apr  2 
03:01:43 2020
@@ -249,31 +249,31 @@ module Svn
 end
   end
 
-  def add_simple_prompt_provider(retry_limit, prompt=Proc.new)
+  def add_simple_prompt_provider(retry_limit, )
 args = [retry_limit]
 klass = AuthCredSimple
 add_prompt_provider("simple", args, prompt, klass)
   end
 
-  def add_username_prompt_provider(retry_limit, prompt=Proc.new)
+  def add_username_prompt_provider(retry_limit, )
 args = [retry_limit]
 klass = AuthCredUsername
 add_prompt_provider("username", args, prompt, klass)
   end
 
-  def add_ssl_server_trust_prompt_provider(prompt=Proc.new)
+  def add_ssl_server_trust_prompt_provider()
 args = []
 klass = AuthCredSSLServerTrust
 add_prompt_provider("ssl_server_trust", args, prompt, klass)
   end
 
-  def add_ssl_client_cert_prompt_provider(retry_limit, prompt=Proc.new)
+  def add_ssl_client_cert_prompt_provider(retry_limit, )
 args = [retry_limit]
 klass = AuthCredSSLClientCert
 add_prompt_provider("ssl_client_cert", args, prompt, klass)
   end
 
-  def add_ssl_client_cert_pw_prompt_provider(retry_limit, prompt=Proc.new)
+  def add_ssl_client_cert_pw_prompt_provider(retry_limit, )
 args = [retry_limit]
 klass = AuthCredSSLClientCertPw
 add_prompt_provider("ssl_client_cert_pw", args, prompt, klass)

svn commit: r1875973 - /subversion/trunk/build.conf

2020-03-31 Thread jamessan

Author: jamessan
Date: Wed Apr  1 01:05:04 2020
New Revision: 1875973

URL: http://svn.apache.org/viewvc?rev=1875973=rev
Log:
* build.conf
  (fs-fs-private-test): Add libsvn_fs_fs to libs to fix link failure

Modified:
subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1875973=1875972=1875973=diff
==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Apr  1 01:05:04 2020
@@ -831,7 +831,7 @@ type = exe
 path = subversion/tests/libsvn_fs_fs
 sources = fs-fs-private-test.c
 install = test
-libs = libsvn_test libsvn_fs libsvn_delta
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
 msvc-force-static = yes

svn propchange: r1875971 - svn:log

2020-03-31 Thread jamessan

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

Modified: svn:log at Tue Mar 31 23:20:40 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 23:20:40 2020
@@ -1,5 +1,6 @@
 Fix various typos detected by codespell
 
+[in subversion]
 * libsvn_client/add.c, libsvn_client/blame.c, libsvn_client/commit_util.c,
   libsvn_client/conflicts.c, libsvn_client/copy.c, libsvn_client/diff.c,
   libsvn_client/export.c, libsvn_client/import.c, libsvn_client/merge.c,

svn propchange: r1875970 - svn:log

2020-03-31 Thread jamessan

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

Modified: svn:log at Tue Mar 31 23:17:54 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 23:17:54 2020
@@ -1,7 +1,8 @@
 Fix various typos detected by codespell
 
-* mod_authz_svn/mod_authz_svn.c, mod_dav_svn/dav_svn.h, mod_dav_svn/mirror.c,
-  mod_dav_svn/mod_dav_svn.c, mod_dav_svn/reports/file-revs.c,
-  mod_dav_svn/reports/list.c, mod_dav_svn/reports/log.c, mod_dav_svn/repos.c,
-  mod_dav_svn/version.c:
+* subversion/mod_authz_svn/mod_authz_svn.c, subversion/mod_dav_svn/dav_svn.h,
+  subversion/mod_dav_svn/mirror.c, subversion/mod_dav_svn/mod_dav_svn.c,
+  subversion/mod_dav_svn/reports/file-revs.c,
+  subversion/mod_dav_svn/reports/list.c, subversion/mod_dav_svn/reports/log.c,
+  subversion/mod_dav_svn/repos.c, subversion/mod_dav_svn/version.c:
   (): Spelling fixes

svn propchange: r1875969 - svn:log

2020-03-31 Thread jamessan

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

Modified: svn:log at Tue Mar 31 23:13:52 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 23:13:52 2020
@@ -1,13 +1,12 @@
 Fix various typos detected by codespell
 
-* include/private/svn_auth_private.h, include/private/svn_branch_impl.h,
-  include/private/svn_config_private.h, include/private/svn_diff_tree.h,
-  include/private/svn_mergeinfo_private.h, include/private/svn_object_pool.h,
-  include/private/svn_repos_private.h, include/private/svn_subr_private.h,
-  include/private/svn_temp_serializer.h, include/private/svn_utf_private.h,
-  include/private/svn_wc_private.h, include/svn_auth.h, include/svn_client.h,
-  include/svn_cmdline.h, include/svn_compat.h, include/svn_fs.h,
-  include/svn_ra.h, include/svn_repos.h, include/svn_types.h,
-  include/svn_types_impl.h, include/svn_version.h, include/svn_wc.h,
-  include/svn_x509.h:
+[in subversion/include]
+* private/svn_auth_private.h, private/svn_branch_impl.h,
+  private/svn_config_private.h, private/svn_diff_tree.h,
+  private/svn_mergeinfo_private.h, private/svn_object_pool.h,
+  private/svn_repos_private.h, private/svn_subr_private.h,
+  private/svn_temp_serializer.h, private/svn_utf_private.h,
+  private/svn_wc_private.h, svn_auth.h, svn_client.h, svn_cmdline.h,
+  svn_compat.h, svn_fs.h, svn_ra.h, svn_repos.h, svn_types.h, svn_types_impl.h,
+  svn_version.h, svn_wc.h, svn_x509.h:
   (): Spelling fixes

svn propchange: r1875968 - svn:log

2020-03-31 Thread jamessan

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

Modified: svn:log at Tue Mar 31 23:13:01 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 23:13:01 2020
@@ -1,10 +1,9 @@
 Fix various typos detected by codespell
 
-* tests/cmdline/externals_tests.py, tests/cmdline/lock_tests.py,
-  tests/cmdline/log_tests.py, tests/cmdline/merge_authz_tests.py,
-  tests/cmdline/merge_tests.py, tests/cmdline/move_tests.py,
-  tests/cmdline/svnadmin_tests.py, tests/cmdline/switch_tests.py,
-  tests/libsvn_client/conflicts-test.c, tests/libsvn_client/mtcc-test.c,
-  tests/libsvn_fs/fs-test.c, tests/libsvn_fs_x/fs-x-pack-test.c,
-  tests/svn_test_main.c:
+[in subversion/tests]
+* cmdline/externals_tests.py, cmdline/lock_tests.py, cmdline/log_tests.py,
+  cmdline/merge_authz_tests.py, cmdline/merge_tests.py, cmdline/move_tests.py,
+  cmdline/svnadmin_tests.py, cmdline/switch_tests.py,
+  libsvn_client/conflicts-test.c, libsvn_client/mtcc-test.c,
+  libsvn_fs/fs-test.c, libsvn_fs_x/fs-x-pack-test.c, svn_test_main.c:
   (): Spelling fixes

svn commit: r1875972 - in /subversion/trunk: ./ notes/ subversion/ subversion/svn/ subversion/svnbench/ subversion/svnfsfs/ subversion/svnlook/ subversion/svnserve/ subversion/svnsync/

2020-03-31 Thread jamessan

Author: jamessan
Date: Tue Mar 31 23:11:01 2020
New Revision: 1875972

URL: http://svn.apache.org/viewvc?rev=1875972=rev
Log:
Fix various typos detected by codespell

* CHANGES, INSTALL, build.conf, configure.ac,
  notes/anchors_and_targets.txt, subversion/svn/cl.h,
  subversion/svn/conflict-callbacks.c, subversion/svn/svn.c,
  subversion/svn_private_config.hw,
  subversion/svnbench/null-blame-cmd.c,
  subversion/svnbench/svnbench.c,
  subversion/svnfsfs/load-index-cmd.c,
  subversion/svnlook/svnlook.c, subversion/svnserve/serve.c,
  subversion/svnserve/server.h, subversion/svnserve/svnserve.c,
  subversion/svnsync/sync.c:
  (): Spelling fixes


Modified:
subversion/trunk/CHANGES
subversion/trunk/INSTALL
subversion/trunk/build.conf
subversion/trunk/configure.ac
subversion/trunk/notes/anchors_and_targets.txt
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/conflict-callbacks.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/svn_private_config.hw
subversion/trunk/subversion/svnbench/null-blame-cmd.c
subversion/trunk/subversion/svnbench/svnbench.c
subversion/trunk/subversion/svnfsfs/load-index-cmd.c
subversion/trunk/subversion/svnlook/svnlook.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/svnserve/server.h
subversion/trunk/subversion/svnserve/svnserve.c
subversion/trunk/subversion/svnsync/sync.c

Modified: subversion/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1875972=1875971=1875972=diff
==
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Tue Mar 31 23:11:01 2020
@@ -1328,7 +1328,7 @@ http://svn.apache.org/repos/asf/subversi
 * cache: fix premature eviction due to 64-bit underflows (r1567996 et al)
 * svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
 * bdb: fix potential integer overflow and underflow (r1570701)
-* bdb: prevent silent propogation of some corruption (r1570778)
+* bdb: prevent silent propagation of some corruption (r1570778)
 * svnadmin hotcopy: do not corrupt db/current contents when copying old
   FSFS repos (r1603485)
 * svnadmin hotcopy: don't produce broken copies when a concurrent pack
@@ -1588,7 +1588,7 @@ http://svn.apache.org/repos/asf/subversi
   ranges (r1569731)
 * svn_rangelist_inheritable2() and svn_mergeinfo_inheritable2(): fix a
   pool lifetime issue (r1569764)
-* new APIs to support cancelation during unified diff output and
+* new APIs to support cancellation during unified diff output and
   allow the context size to be specified (r1570149 et al)
 * APIs related to retrieving logs are now documented to be unlimited when
   a negative value is passed for the limit (r1570330, 1570335)
@@ -1706,7 +1706,7 @@ http://svn.apache.org/repos/asf/subversi
 * swig-py: Add close to the core.Stream class (r1619077)
 * javahl: add example clients that use the authn API (r1640533)
 * swig-py: implement dump stream parser (r1642813)
-* swig-pl: remove some unneded cleanup code that triggered a cleanup
+* swig-pl: remove some unneeded cleanup code that triggered a cleanup
   failure on windows (r1643072)
 * swig-pl: make cancel_func, cancel_baton parameter pairs work (r1648852)
 * javahl: expose whitespace diff parameters to blame method (issue #4475)
@@ -2037,7 +2037,7 @@ http://svn.apache.org/repos/asf/subversi
   - Client-side bugfixes:
 * log: use proper peg revision over DAV (r1568872)
 * upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al)
-* proplist: resolve inconsitent inherited property results (r1575270 et al)
+* proplist: resolve inconsistent inherited property results (r1575270 et 
al)
 * increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al)
 * merge: automatic merge confused by subtree merge (issue #4481)
 * propget: report proper error on invalid revision for url (r1586255)
@@ -2079,7 +2079,7 @@ http://svn.apache.org/repos/asf/subversi
  Developer-visible changes:
   - General:
 * improve consistency checks of DAV inherited property requests (r1498000)
-* fix ocassional failure in autoprop_tests.py (r1567752)
+* fix occasional failure in autoprop_tests.py (r1567752)
 * avoid duplicate sqlite analyze information rows (r1571214)
 * add Mavericks to our sysinfo output (r1573088)
 * bump copyright years to 2014 (r1555403)
@@ -2132,7 +2132,7 @@ http://svn.apache.org/repos/asf/subversi
 
  Developer-visible changes:
   - General:
-* fix ocassional failure of check_tests.py 12 (r1496127 et al)
+* fix occasional failure of check_tests.py 12 (r1496127 et al)
 * fix failure with SQLite 3.8.1-3.8.3 when built with
   SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392)
 * specify SQLite defaults

svn commit: r1875971 [2/2] - in /subversion/trunk/subversion: libsvn_client/ libsvn_delta/ libsvn_diff/ libsvn_fs/ libsvn_fs_base/ libsvn_fs_base/bdb/ libsvn_fs_base/notes/ libsvn_fs_fs/ libsvn_fs_x/

2020-03-31 Thread jamessan

Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1875971=1875970=1875971=diff
==
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Tue Mar 31 23:07:06 
2020
@@ -550,7 +550,7 @@ parse_option(int *pch, parse_context_t *
 }
 
 
-/* Read chars until enounter ']', then skip everything to the end of
+/* Read chars until encounter ']', then skip everything to the end of
  * the line.  Set *PCH to the character that ended the line (either
  * newline or EOF), and set CTX->section to the string of characters
  * seen before ']'.

Modified: subversion/trunk/subversion/libsvn_subr/date.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/date.c?rev=1875971=1875970=1875971=diff
==
--- subversion/trunk/subversion/libsvn_subr/date.c (original)
+++ subversion/trunk/subversion/libsvn_subr/date.c Tue Mar 31 23:07:06 2020
@@ -37,7 +37,7 @@ enum rule_action {
if the next template character matches the current
value character, continue processing as normal.
Otherwise, attempt to complete matching starting
-   immediately after the first subsequent occurrance of
+   immediately after the first subsequent occurrence of
']' in the template. */
   SKIP, /* Ignore this template character */
   ACCEPT/* Accept the value */

Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1875971=1875970=1875971=diff
==
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Tue Mar 31 23:07:06 2020
@@ -680,9 +680,9 @@ simple_gpg_agent_next_creds(void **crede
   /* TODO: This attempt limit hard codes it at 3 attempts (or 2 retries)
* which matches svn command line client's retry_limit as set in
* svn_cmdline_create_auth_baton().  It would be nice to have that
-   * limit reflected here but that violates the boundry between the
+   * limit reflected here but that violates the boundary between the
* prompt provider and the cache provider.  gpg-agent is acting as
-   * both here due to the peculiarties of their design so we'll have to
+   * both here due to the peculiarities of their design so we'll have to
* live with this for now.  Note that when these failures get exceeded
* it'll eventually fall back on the retry limits of whatever prompt
* provider is in effect, so this effectively doubles the limit. */

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1875971=1875970=1875971=diff
==
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Tue Mar 31 23:07:06 2020
@@ -2797,7 +2797,7 @@ stringbuf_from_aprfile(svn_stringbuf_t *
  correct, for instance, because the underlying handle could be
  pointing to a pipe.  We don't know that in advance, so attempt
  to read *one more* byte than necessary.  If we get an EOF, then
- we're done and we have succesfully avoided reading the file chunk-
+ we're done and we have successfully avoided reading the file 
chunk-
  by-chunk.  If we don't, we fall through and do so to read the
  remaining part of the file. */
   svn_boolean_t eof;

Modified: subversion/trunk/subversion/libsvn_subr/object_pool.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/object_pool.c?rev=1875971=1875970=1875971=diff
==
--- subversion/trunk/subversion/libsvn_subr/object_pool.c (original)
+++ subversion/trunk/subversion/libsvn_subr/object_pool.c Tue Mar 31 23:07:06 
2020
@@ -174,7 +174,7 @@ add_object_ref(object_ref_t *object_ref,
 
   /* Make sure the reference gets released automatically.
  Since POOL might be a parent pool of OBJECT_REF->OBJECT_POOL,
- to the reference counting update before destroing any of the
+ to the reference counting update before destroying any of the
  pool hierarchy. */
   apr_pool_pre_cleanup_register(pool, object_ref, object_ref_cleanup);
 }

Modified: subversion/trunk/subversion/libsvn_subr/path.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/path.c?rev=1875971=1875970=1875971=diff

svn commit: r1875971 [1/2] - in /subversion/trunk/subversion: libsvn_client/ libsvn_delta/ libsvn_diff/ libsvn_fs/ libsvn_fs_base/ libsvn_fs_base/bdb/ libsvn_fs_base/notes/ libsvn_fs_fs/ libsvn_fs_x/

2020-03-31 Thread jamessan

Author: jamessan
Date: Tue Mar 31 23:07:06 2020
New Revision: 1875971

URL: http://svn.apache.org/viewvc?rev=1875971=rev
Log:
Fix various typos detected by codespell

* libsvn_client/add.c, libsvn_client/blame.c, libsvn_client/commit_util.c,
  libsvn_client/conflicts.c, libsvn_client/copy.c, libsvn_client/diff.c,
  libsvn_client/export.c, libsvn_client/import.c, libsvn_client/merge.c,
  libsvn_client/mergeinfo.c, libsvn_client/mergeinfo.h, libsvn_client/patch.c,
  libsvn_client/switch.c, libsvn_client/update.c, libsvn_delta/branch_compat.c,
  libsvn_delta/compat.c, libsvn_delta/compose_delta.c, libsvn_delta/svndiff.c,
  libsvn_delta/xdelta.c, libsvn_diff/deprecated.c, libsvn_diff/diff_file.c,
  libsvn_fs/fs-loader.c, libsvn_fs_base/bdb/locks-table.c, libsvn_fs_base/fs.c,
  libsvn_fs_base/key-gen.c, libsvn_fs_base/notes/fs-history,
  libsvn_fs_base/reps-strings.c, libsvn_fs_base/tree.c,
  libsvn_fs_fs/cached_data.c, libsvn_fs_fs/hotcopy.c, libsvn_fs_fs/index.c,
  libsvn_fs_fs/low_level.c, libsvn_fs_fs/pack.c, libsvn_fs_fs/structure,
  libsvn_fs_fs/temp_serializer.c, libsvn_fs_fs/transaction.c,
  libsvn_fs_fs/tree.c, libsvn_fs_fs/util.h, libsvn_fs_x/cached_data.c,
  libsvn_fs_x/caching.c, libsvn_fs_x/hotcopy.c, libsvn_fs_x/id.h,
  libsvn_fs_x/index.c, libsvn_fs_x/low_level.c, libsvn_fs_x/pack.c,
  libsvn_fs_x/rev_file.c, libsvn_fs_x/structure, libsvn_fs_x/temp_serializer.c,
  libsvn_fs_x/transaction.c, libsvn_fs_x/tree.c, libsvn_fs_x/util.h,
  libsvn_ra/ra_loader.c, libsvn_ra/ra_loader.h, libsvn_ra/util.c,
  libsvn_ra/wrapper_template.h, libsvn_ra_local/ra_plugin.c,
  libsvn_ra_serf/commit.c, libsvn_ra_serf/get_file.c,
  libsvn_ra_serf/property.c, libsvn_ra_serf/ra_serf.h, libsvn_ra_serf/update.c,
  libsvn_ra_serf/util.c, libsvn_ra_svn/client.c, libsvn_ra_svn/cyrus_auth.c,
  libsvn_ra_svn/marshal.c, libsvn_repos/authz_parse.c, libsvn_repos/commit.c,
  libsvn_repos/compat.c, libsvn_repos/hooks.c, libsvn_repos/load.c,
  libsvn_repos/log.c, libsvn_repos/notify.c, libsvn_repos/repos.c,
  libsvn_repos/repos.h, libsvn_subr/cache-memcache.c, libsvn_subr/cmdline.c,
  libsvn_subr/config_file.c, libsvn_subr/date.c, libsvn_subr/gpg_agent.c,
  libsvn_subr/io.c, libsvn_subr/object_pool.c, libsvn_subr/path.c,
  libsvn_subr/prompt.c, libsvn_subr/string.c, libsvn_subr/sysinfo.c,
  libsvn_subr/temp_serializer.c, libsvn_subr/utf.c, libsvn_subr/utf8proc.c,
  libsvn_subr/version.c, libsvn_subr/win32_xlate.c, libsvn_subr/x509parse.c,
  libsvn_wc/conflicts.c, libsvn_wc/conflicts.h, libsvn_wc/copy.c,
  libsvn_wc/lock.c, libsvn_wc/wc_db.c, libsvn_wc/wc_db.h,
  libsvn_wc/wc_db_private.h:
  (): Spelling fixes

Modified:
subversion/trunk/subversion/libsvn_client/add.c
subversion/trunk/subversion/libsvn_client/blame.c
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/conflicts.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/import.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_client/switch.c
subversion/trunk/subversion/libsvn_client/update.c
subversion/trunk/subversion/libsvn_delta/branch_compat.c
subversion/trunk/subversion/libsvn_delta/compat.c
subversion/trunk/subversion/libsvn_delta/compose_delta.c
subversion/trunk/subversion/libsvn_delta/svndiff.c
subversion/trunk/subversion/libsvn_delta/xdelta.c
subversion/trunk/subversion/libsvn_diff/deprecated.c
subversion/trunk/subversion/libsvn_diff/diff_file.c
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/trunk/subversion/libsvn_fs_base/fs.c
subversion/trunk/subversion/libsvn_fs_base/key-gen.c
subversion/trunk/subversion/libsvn_fs_base/notes/fs-history
subversion/trunk/subversion/libsvn_fs_base/reps-strings.c
subversion/trunk/subversion/libsvn_fs_base/tree.c
subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c
subversion/trunk/subversion/libsvn_fs_fs/index.c
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/pack.c
subversion/trunk/subversion/libsvn_fs_fs/structure
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_fs_fs/util.h
subversion/trunk/subversion/libsvn_fs_x/cached_data.c
subversion/trunk/subversion/libsvn_fs_x/caching.c
subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
subversion/trunk/subversion/libsvn_fs_x/id.h

svn commit: r1875970 - in /subversion/trunk/subversion: mod_authz_svn/ mod_dav_svn/ mod_dav_svn/reports/

2020-03-31 Thread jamessan

Author: jamessan
Date: Tue Mar 31 23:01:05 2020
New Revision: 1875970

URL: http://svn.apache.org/viewvc?rev=1875970=rev
Log:
Fix various typos detected by codespell

* mod_authz_svn/mod_authz_svn.c, mod_dav_svn/dav_svn.h, mod_dav_svn/mirror.c,
  mod_dav_svn/mod_dav_svn.c, mod_dav_svn/reports/file-revs.c,
  mod_dav_svn/reports/list.c, mod_dav_svn/reports/log.c, mod_dav_svn/repos.c,
  mod_dav_svn/version.c:
  (): Spelling fixes

Modified:
subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c
subversion/trunk/subversion/mod_dav_svn/dav_svn.h
subversion/trunk/subversion/mod_dav_svn/mirror.c
subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c
subversion/trunk/subversion/mod_dav_svn/reports/list.c
subversion/trunk/subversion/mod_dav_svn/reports/log.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/mod_dav_svn/version.c

Modified: subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c?rev=1875970=1875969=1875970=diff
==
--- subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c Tue Mar 31 
23:01:05 2020
@@ -327,7 +327,7 @@ log_access_verdict(LOG_ARGS_SIGNATURE,
 }
 }
 
-/* Log a message at LOG_LEVEL indiciating the ERR encountered during
+/* Log a message at LOG_LEVEL indicating the ERR encountered during
  * the request R.
  * LOG_ARGS_SIGNATURE expands as in log_access_verdict() above.
  * PREFIX is inserted at the start of the message.  The rest of the
@@ -754,9 +754,9 @@ req_check_access(request_rec *r,
*
* However, if repos_path == NULL and the request requires write
* access, then perform a global authz lookup.  The request is
-   * denied if the user commiting isn't granted any access anywhere
+   * denied if the user committing isn't granted any access anywhere
* in the repository.  This is to avoid operations that involve no
-   * paths (commiting an empty revision, leaving a dangling
+   * paths (committing an empty revision, leaving a dangling
* transaction in the FS) being granted by default, letting
* unauthenticated users write some changes to the repository.
* This was issue #2388.
@@ -1147,7 +1147,7 @@ register_hooks(apr_pool_t *p)
 module AP_MODULE_DECLARE_DATA authz_svn_module =
 {
   STANDARD20_MODULE_STUFF,
-  create_authz_svn_dir_config, /* dir config creater */
+  create_authz_svn_dir_config, /* dir config creator */
   NULL,/* dir merger --- default is to override */
   NULL,/* server config */
   NULL,/* merge server config */

Modified: subversion/trunk/subversion/mod_dav_svn/dav_svn.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/dav_svn.h?rev=1875970=1875969=1875970=diff
==
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Tue Mar 31 23:01:05 2020
@@ -205,7 +205,7 @@ typedef struct dav_svn_root {
   */
   const char *activity_id;
 
-  /* If the root is part of a transaction, this contains the FS's tranaction
+  /* If the root is part of a transaction, this contains the FS's transaction
  name. It may be NULL if this root corresponds to a specific revision.
  It may also be NULL if we have not opened the root yet.
 
@@ -1109,7 +1109,7 @@ int dav_svn__parse_request_skel(svn_skel
 /* Set *YOUNGEST_P to the number of the youngest revision in REPOS.
  *
  * Youngest revision will be cached in REPOS->YOUNGEST_REV to avoid
- * fetching the youngest revision multiple times during proccessing
+ * fetching the youngest revision multiple times during processing
  * the request.
  *
  * Uses SCRATCH_POOL for temporary allocations.

Modified: subversion/trunk/subversion/mod_dav_svn/mirror.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mirror.c?rev=1875970=1875969=1875970=diff
==
--- subversion/trunk/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mirror.c Tue Mar 31 23:01:05 2020
@@ -97,7 +97,7 @@ int dav_svn__proxy_request_fixup(request
ourselves -- but we need to make sure they aren't aimed at
resources that only exist on the master server such as
working resource URIs or the HTTPv2 transaction root and
-   transaction tree resouces. */
+   transaction tree resources. */
 if (r->method_number == M_PROPFIND ||
 r->method_number == M_GET) {
 if ((seg = ap_strstr(r->uri, root_dir)))

svn commit: r1875969 - in /subversion/trunk/subversion/include: ./ private/

2020-03-31 Thread jamessan

Author: jamessan
Date: Tue Mar 31 22:54:33 2020
New Revision: 1875969

URL: http://svn.apache.org/viewvc?rev=1875969=rev
Log:
Fix various typos detected by codespell

* include/private/svn_auth_private.h, include/private/svn_branch_impl.h,
  include/private/svn_config_private.h, include/private/svn_diff_tree.h,
  include/private/svn_mergeinfo_private.h, include/private/svn_object_pool.h,
  include/private/svn_repos_private.h, include/private/svn_subr_private.h,
  include/private/svn_temp_serializer.h, include/private/svn_utf_private.h,
  include/private/svn_wc_private.h, include/svn_auth.h, include/svn_client.h,
  include/svn_cmdline.h, include/svn_compat.h, include/svn_fs.h,
  include/svn_ra.h, include/svn_repos.h, include/svn_types.h,
  include/svn_types_impl.h, include/svn_version.h, include/svn_wc.h,
  include/svn_x509.h:
  (): Spelling fixes

Modified:
subversion/trunk/subversion/include/private/svn_auth_private.h
subversion/trunk/subversion/include/private/svn_branch_impl.h
subversion/trunk/subversion/include/private/svn_config_private.h
subversion/trunk/subversion/include/private/svn_diff_tree.h
subversion/trunk/subversion/include/private/svn_mergeinfo_private.h
subversion/trunk/subversion/include/private/svn_object_pool.h
subversion/trunk/subversion/include/private/svn_repos_private.h
subversion/trunk/subversion/include/private/svn_subr_private.h
subversion/trunk/subversion/include/private/svn_temp_serializer.h
subversion/trunk/subversion/include/private/svn_utf_private.h
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/include/svn_auth.h
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_cmdline.h
subversion/trunk/subversion/include/svn_compat.h
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/include/svn_ra.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/include/svn_types_impl.h
subversion/trunk/subversion/include/svn_version.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/include/svn_x509.h

Modified: subversion/trunk/subversion/include/private/svn_auth_private.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_auth_private.h?rev=1875969=1875968=1875969=diff
==
--- subversion/trunk/subversion/include/private/svn_auth_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_auth_private.h Tue Mar 31 
22:54:33 2020
@@ -39,7 +39,7 @@ extern "C" {
 
 /** SSL server authority verification credential type.
  *
- * The followin auth parameters are available to the providers:
+ * The following auth parameters are available to the providers:
  *
  * - @c SVN_AUTH_PARAM_SSL_SERVER_FAILURES (@c apr_uint32_t*)
  * - @c SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO

Modified: subversion/trunk/subversion/include/private/svn_branch_impl.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_branch_impl.h?rev=1875969=1875968=1875969=diff
==
--- subversion/trunk/subversion/include/private/svn_branch_impl.h (original)
+++ subversion/trunk/subversion/include/private/svn_branch_impl.h Tue Mar 31 
22:54:33 2020
@@ -21,7 +21,7 @@
  * @endcopyright
  *
  * @file svn_branch_impl.h
- * @brief Declarations needed by implementators of branch classes
+ * @brief Declarations needed by implementors of branch classes
  *
  * @since New in ???.
  */
@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 
-/* Common aspects od a txn/branch 'editor' class (derived from Ev2) */
+/* Common aspects of a txn/branch 'editor' class (derived from Ev2) */
 typedef struct svn_branch__vtable_priv_t
 {
   /* Standard cancellation function. Called before each callback.  */

Modified: subversion/trunk/subversion/include/private/svn_config_private.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_config_private.h?rev=1875969=1875968=1875969=diff
==
--- subversion/trunk/subversion/include/private/svn_config_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_config_private.h Tue Mar 31 
22:54:33 2020
@@ -77,7 +77,7 @@ typedef svn_error_t *(*svn_config__add_v
 
 
 /*
- * Create a new constuctor allocated from RESULT_POOL.
+ * Create a new constructor allocated from RESULT_POOL.
  * Any of the callback functions may be NULL.
  * The constructor implementation is responsible for implementing any
  * case-insensitivity, value expansion, or other features on top of
@@ -98,9 +98,9 @@ svn_config__constructor_create(
  * passed to the callback in the same order as they're defined in
  * STREAM.

svn commit: r1875968 - in /subversion/trunk/subversion/tests: ./ cmdline/ libsvn_client/ libsvn_fs/ libsvn_fs_x/

2020-03-31 Thread jamessan

Author: jamessan
Date: Tue Mar 31 22:50:41 2020
New Revision: 1875968

URL: http://svn.apache.org/viewvc?rev=1875968=rev
Log:
Fix various typos detected by codespell

* tests/cmdline/externals_tests.py, tests/cmdline/lock_tests.py,
  tests/cmdline/log_tests.py, tests/cmdline/merge_authz_tests.py,
  tests/cmdline/merge_tests.py, tests/cmdline/move_tests.py,
  tests/cmdline/svnadmin_tests.py, tests/cmdline/switch_tests.py,
  tests/libsvn_client/conflicts-test.c, tests/libsvn_client/mtcc-test.c,
  tests/libsvn_fs/fs-test.c, tests/libsvn_fs_x/fs-x-pack-test.c,
  tests/svn_test_main.c:
  (): Spelling fixes

Modified:
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/lock_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_tests.py
subversion/trunk/subversion/tests/cmdline/move_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/trunk/subversion/tests/svn_test_main.c

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1875968=1875967=1875968=diff
==
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Mar 31 
22:50:41 2020
@@ -3911,7 +3911,7 @@ def copy_pin_externals_whitespace_dir(sb
   branches_url = repo_url + '/branches'
   trunk_wc = sbox.ospath('trunk')
 
-  # Create a new revision to creat interesting pinning revisions
+  # Create a new revision to create interesting pinning revisions
   sbox.simple_propset('A', 'B', 'trunk')
   sbox.simple_commit('trunk')
 

Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1875968=1875967=1875968=diff
==
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Tue Mar 31 22:50:41 
2020
@@ -1001,7 +1001,7 @@ def lock_and_exebit1(sbox):
   if (not gamma_stat & mode_r
   or gamma_stat & mode_w
   or not gamma_stat & mode_x):
-logger.warn("Commiting a file with 'svn:needs-lock, svn:executable'")
+logger.warn("Committing a file with 'svn:needs-lock, svn:executable'")
 logger.warn("after unlocking modified file's permissions")
 raise svntest.Failure
 
@@ -1065,7 +1065,7 @@ def lock_and_exebit2(sbox):
   if (not gamma_stat & mode_r
   or gamma_stat & mode_w
   or not gamma_stat & mode_x):
-logger.warn("Commiting a file with 'svn:needs-lock, svn:executable'")
+logger.warn("Committing a file with 'svn:needs-lock, svn:executable'")
 logger.warn("did not set the file to read-only, executable")
 raise svntest.Failure
 
@@ -1454,7 +1454,7 @@ def lock_path_not_in_head(sbox):
   svntest.actions.run_and_verify_svn(None, [], 'up', '-r1', wc_dir)
   expected_lock_fail_err_re = "svn: warning: W160042: " \
   "(Path .* doesn't exist in HEAD revision)"
-  # Issue #3524 These lock attemtps were triggering an assert over ra_serf:
+  # Issue #3524 These lock attempts were triggering an assert over ra_serf:
   #
   # working_copies\lock_tests-37>svn lock A\D
   # ..\..\..\subversion\libsvn_client\ra.c:275: (apr_err=235000)
@@ -1835,7 +1835,7 @@ def commit_stolen_lock(sbox):
 # When removing directories, the locks of contained files were not
 # correctly removed from the working copy database, thus they later
 # magically reappeared when new files or directories with the same
-# pathes were added.
+# paths were added.
 @Issue(4364)
 def drop_locks_on_parent_deletion(sbox):
   "drop locks when the parent is deleted"
@@ -1856,7 +1856,7 @@ def drop_locks_on_parent_deletion(sbox):
 [],
 expected_status)
 
-  # now re-add entities to the deleted pathes.
+  # now re-add entities to the deleted paths.
   sbox.simple_mkdir('A/B')
   sbox.simple_add_text('new file replacing old file', 'A/B/lambda')
   sbox.simple_add_text('file replacing former dir', 'A/B/F')

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL:

svn commit: r1875904 - in /subversion/trunk/subversion/bindings: cxx/ cxx/include/svnxx/ cxx/src/aprwrap/ javahl/ javahl/native/ javahl/src/org/apache/subversion/javahl/ javahl/src/org/apache/subversi

2020-03-30 Thread jamessan

Author: jamessan
Date: Tue Mar 31 01:49:25 2020
New Revision: 1875904

URL: http://svn.apache.org/viewvc?rev=1875904=rev
Log:
Fix various typos detected by codespell

[in subversion/bindings]
* cxx/README, cxx/include/svnxx/tristate.hpp, cxx/src/aprwrap/array.hpp,
  javahl/README, javahl/native/JNIStackElement.cpp, javahl/native/JNIUtil.h,
  javahl/native/NativeStream.hpp, javahl/native/OperationContext.cpp,
  javahl/native/org_apache_subversion_javahl_util_PropLib.cpp,
  javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java,
  javahl/src/org/apache/subversion/javahl/ISVNClient.java,
  javahl/src/org/apache/subversion/javahl/ISVNRemote.java,
  javahl/src/org/apache/subversion/javahl/ISVNRepos.java,
  javahl/src/org/apache/subversion/javahl/NativeResources.java,
  javahl/src/org/apache/subversion/javahl/SVNClient.java,
  javahl/src/org/apache/subversion/javahl/SVNRepos.java,
  javahl/src/org/apache/subversion/javahl/SVNUtil.java,
  javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java,
  javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java,
  javahl/src/org/apache/subversion/javahl/types/Property.java,
  javahl/src/org/apache/subversion/javahl/types/Revision.java,
  javahl/src/org/apache/subversion/javahl/types/Status.java,
  javahl/src/org/apache/subversion/javahl/types/VersionExtended.java,
  javahl/src/org/tigris/subversion/javahl/Notify.java,
  javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java,
  javahl/src/org/tigris/subversion/javahl/PropertyData.java,
  javahl/src/org/tigris/subversion/javahl/Revision.java,
  javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,
  javahl/src/org/tigris/subversion/javahl/SVNClient.java,
  javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java,
  javahl/src/org/tigris/subversion/javahl/Status.java,
  javahl/src/org/tigris/subversion/javahl/StatusKind.java,
  swig/include/proxy.py, swig/perl/libsvn_swig_perl/swigutil_pl.c,
  swig/perl/native/Client.pm, swig/perl/native/Core.pm,
  swig/python/tests/client.py, swig/python/tests/ra.py,
  swig/python/tests/typemap.py:
  (): Spelling fixes


Modified:
subversion/trunk/subversion/bindings/cxx/README
subversion/trunk/subversion/bindings/cxx/include/svnxx/tristate.hpp
subversion/trunk/subversion/bindings/cxx/src/aprwrap/array.hpp
subversion/trunk/subversion/bindings/javahl/README
subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
subversion/trunk/subversion/bindings/javahl/native/NativeStream.hpp
subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp

subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Notify.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java

subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl

svn propchange: r1875903 - svn:log

2020-03-30 Thread jamessan

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

Modified: svn:log at Tue Mar 31 01:33:07 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 01:33:07 2020
@@ -1,7 +1,8 @@
+Fix various typos detected by codespell.
+
 * tools/buildbot/slaves/README, tools/buildbot/slaves/svn-x64-macosx/setenv.sh,
   tools/dev/build-svn-deps-win.pl, tools/dev/find-control-statements.py,
   tools/dev/mergegraph/mergegraph.py, tools/dev/stress.pl,
   tools/dev/x509-parser.c, tools/dist/backport.pl, tools/dist/dist.sh,
   tools/dist/release.py, tools/examples/get-location-segments.py:
-  (): Fix various typos detected by codespell.
-
+  (): Spelling fixes

svn commit: r1875903 - in /subversion/trunk/tools: buildbot/slaves/ buildbot/slaves/svn-x64-macosx/ dev/ dev/mergegraph/ dist/ examples/

2020-03-30 Thread jamessan

Author: jamessan
Date: Tue Mar 31 01:16:49 2020
New Revision: 1875903

URL: http://svn.apache.org/viewvc?rev=1875903=rev
Log:
* tools/buildbot/slaves/README, tools/buildbot/slaves/svn-x64-macosx/setenv.sh,
  tools/dev/build-svn-deps-win.pl, tools/dev/find-control-statements.py,
  tools/dev/mergegraph/mergegraph.py, tools/dev/stress.pl,
  tools/dev/x509-parser.c, tools/dist/backport.pl, tools/dist/dist.sh,
  tools/dist/release.py, tools/examples/get-location-segments.py:
  (): Fix various typos detected by codespell.


Modified:
subversion/trunk/tools/buildbot/slaves/README
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
subversion/trunk/tools/dev/build-svn-deps-win.pl
subversion/trunk/tools/dev/find-control-statements.py
subversion/trunk/tools/dev/mergegraph/mergegraph.py
subversion/trunk/tools/dev/stress.pl
subversion/trunk/tools/dev/x509-parser.c
subversion/trunk/tools/dist/backport.pl
subversion/trunk/tools/dist/dist.sh
subversion/trunk/tools/dist/release.py
subversion/trunk/tools/examples/get-location-segments.py

Modified: subversion/trunk/tools/buildbot/slaves/README
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/README?rev=1875903=1875902=1875903=diff
==
--- subversion/trunk/tools/buildbot/slaves/README (original)
+++ subversion/trunk/tools/buildbot/slaves/README Tue Mar 31 01:16:49 2020
@@ -63,7 +63,7 @@ branches/1.4.x. If the buildslave is not
 stored in the queue and started when the buildslave connects.
 
 Normally each build only includes the changes of one commit. However, when 
-multiple changes arive during a previous build, those will be combined in 
+multiple changes arrive during a previous build, those will be combined in 
 a next build.
 
 The buildmaster looks at each commit and decides if they are important enough

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh?rev=1875903=1875902=1875903=diff
==
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Tue Mar 31 
01:16:49 2020
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-## This script calls a helper that provides the folloing environemnt
+## This script calls a helper that provides the following environment
 ## variables:
 ##
 ## PATH The search path

Modified: subversion/trunk/tools/dev/build-svn-deps-win.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/build-svn-deps-win.pl?rev=1875903=1875902=1875903=diff
==
--- subversion/trunk/tools/dev/build-svn-deps-win.pl (original)
+++ subversion/trunk/tools/dev/build-svn-deps-win.pl Tue Mar 31 01:16:49 2020
@@ -61,7 +61,7 @@
 ##   V A R I A B L E S   ##
 ###
 package Vars;
-# variables in the Vars package can be overriden from the command
+# variables in the Vars package can be overridden from the command
 # line with the FOO=BAR syntax.  If you want any defaults to reference
 # other variables the defaults need to be in set_defaults() below to
 # allow the defaults to be set after processing user set variables.
@@ -108,9 +108,9 @@ our $PROJREF_URL = 'https://downloads.re
 
 # Location of the already downloaded file.
 # by default these are undefined and set by the downloader.
-# However, they can be overriden from the commandline and then
+# However, they can be overridden from the commandline and then
 # the downloader is skipped.  Note that BDB has no downloader
-# so it must be overriden from the command line.
+# so it must be overridden from the command line.
 our $AWK_FILE;
 our $HTTPD_FILE;
 our $APR_FILE;
@@ -861,7 +861,7 @@ sub main {
 # Look for variable assignment
 if (my ($lhs, $rhs) = $arg =~ /([^=]+)=(.*)/) {
   # Bit of hackery to allow the global values in the
-  # Vars package to be overriden from the command line.
+  # Vars package to be overridden from the command line.
   # E.G. "CMAKE=C:\CMake\cmake.exe" would replace the
   # default value with this value.
   if (exists($Vars::{$lhs})) {

Modified: subversion/trunk/tools/dev/find-control-statements.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/find-control-statements.py?rev=1875903=1875902=1875903=diff
==
--- subversion/trunk/tools/dev/find-control-statements.py (original)
+++ subversion/trunk/tools/dev/find-control-statements.py Tue Mar 31 01:16:49 
2020
@@ -56,7 +56,7 @@ def print_line(fname, line_num, line):
 def is_co

svn propchange: r1875680 - svn:log

2020-03-30 Thread jamessan

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

Modified: svn:log at Tue Mar 31 01:11:06 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 01:11:06 2020
@@ -5,7 +5,7 @@ libsvn_auth_kwallet shared library is st
 KAboutData is being deleted, libsvn_auth_kwallet may have already been
 unloaded, causing the destructor to access invalid memory.
 
-* subversion/libsvn_auth_kwallet
+* subversion/libsvn_auth_kwallet.cpp
   (kwallet_password_get, kwallet_password_set): Replace use of QStringLiteral
with QString

svn propchange: r1875680 - svn:log

2020-03-30 Thread jamessan

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

Modified: svn:log at Tue Mar 31 01:10:30 2020
--
--- svn:log (original)
+++ svn:log Tue Mar 31 01:10:30 2020
@@ -5,4 +5,8 @@ libsvn_auth_kwallet shared library is st
 KAboutData is being deleted, libsvn_auth_kwallet may have already been
 unloaded, causing the destructor to access invalid memory.
 
+* subversion/libsvn_auth_kwallet
+  (kwallet_password_get, kwallet_password_set): Replace use of QStringLiteral
+   with QString
+
 Patch by: Bernhard Übelacker

svn commit: r1875771 - /subversion/branches/1.14.x/STATUS

2020-03-27 Thread jamessan

Author: jamessan
Date: Fri Mar 27 11:35:30 2020
New Revision: 1875771

URL: http://svn.apache.org/viewvc?rev=1875771=rev
Log:
* STATUS:
  Vote +1 on r1875726, approving.
  Vote +1 on the r1875742 group.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1875771=1875770=1875771=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Mar 27 11:35:30 2020
@@ -15,7 +15,6 @@ Status of 1.14.0:
 Candidate changes:
 ==
 
-
  * r1875680
Construct KAboutData using QString rather than QStringLiteral
Justification:
@@ -23,23 +22,23 @@ Candidate changes:
Votes:
  +1: jamessan, stsp
 
- * r1875726
-   Error out if generating SWIG-related files fails in autogen.sh --release
-   Justification:
- release.py didn't catch this error when 1.14.0-rc1 release was created
-   Votes:
- +1: stsp, hartmannathan
- 
  * r1875742, r1875762
Fix autogen.sh SWIG python bindings generation in --release mode.
Justification:
  We can no longer create usable release artifacts without this fix.
Votes:
- +1: stsp
+ +1: stsp, jamessan
 
 Veto-blocked changes:
 =
 
-
 Approved changes:
 =
+
+ * r1875726
+   Error out if generating SWIG-related files fails in autogen.sh --release
+   Justification:
+ release.py didn't catch this error when 1.14.0-rc1 release was created
+   Votes:
+ +1: stsp, hartmannathan, jamessan
+

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

2020-03-25 Thread jamessan

Author: jamessan
Date: Thu Mar 26 01:54:43 2020
New Revision: 1875682

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

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=1875682=1875681=1875682=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Mar 26 01:54:43 2020
@@ -31,6 +31,13 @@ Candidate changes:
Votes:
  +1: julianfoad
 
+ * r1875680
+   Construct KAboutData using QString rather than QStringLiteral
+   Justification:
+ Fixes a crash seen when using git-svn with kwallet
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1875681 - /subversion/branches/1.14.x/STATUS

2020-03-25 Thread jamessan

Author: jamessan
Date: Thu Mar 26 01:49:35 2020
New Revision: 1875681

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

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1875681=1875680=1875681=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Mar 26 01:49:35 2020
@@ -16,6 +16,13 @@ Candidate changes:
 ==
 
 
+ * r1875680
+   Construct KAboutData using QString rather than QStringLiteral
+   Justification:
+ Fixes a crash seen when using git-svn with kwallet
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1875680 - /subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

2020-03-25 Thread jamessan

Author: jamessan
Date: Thu Mar 26 01:44:32 2020
New Revision: 1875680

URL: http://svn.apache.org/viewvc?rev=1875680=rev
Log:
Construct KAboutData using QString rather than QStringLiteral

If QStringLiteral is used, then a pointer to the data segment of the
libsvn_auth_kwallet shared library is stored in KAboutData.  On exit, when
KAboutData is being deleted, libsvn_auth_kwallet may have already been
unloaded, causing the destructor to access invalid memory.

Patch by: Bernhard Übelacker 

Modified:
subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Modified: subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1875680=1875679=1875680=diff
==
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp (original)
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Thu Mar 26 
01:44:32 2020
@@ -227,10 +227,10 @@ kwallet_password_get(svn_boolean_t *done
   KLocalizedString::setApplicationDomain("subversion"); /* translation domain 
*/
 
   /* componentName appears in KDE GUI prompts */
-  KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+  KAboutData aboutData(QString("subversion"),/* componentName */
i18n(get_application_name(parameters,
  pool)), /* displayName */
-   QStringLiteral(SVN_VER_NUMBER));
+   QString(SVN_VER_NUMBER));
   KAboutData::setApplicationData(aboutData);
 #else
   KCmdLineArgs::init(q_argc, q_argv,
@@ -309,10 +309,10 @@ kwallet_password_set(svn_boolean_t *done
   KLocalizedString::setApplicationDomain("subversion"); /* translation domain 
*/
 
   /* componentName appears in KDE GUI prompts */
-  KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
+  KAboutData aboutData(QString("subversion"),/* componentName */
i18n(get_application_name(parameters,
  pool)), /* displayName */
-   QStringLiteral(SVN_VER_NUMBER));
+   QString(SVN_VER_NUMBER));
   KAboutData::setApplicationData(aboutData);
 #else
   KCmdLineArgs::init(q_argc, q_argv,

svn commit: r1875602 - /subversion/trunk/build/ac-macros/swig.m4

2020-03-24 Thread jamessan

Author: jamessan
Date: Tue Mar 24 23:30:21 2020
New Revision: 1875602

URL: http://svn.apache.org/viewvc?rev=1875602=rev
Log:
Remove incorrect include paths from svn_cv_ruby_includes.

Files under ruby/ and ruby/backward/ should be included using "#include
", if needed, instead of adding those directories to the include
path.

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Remove "-I$rbconfig_rubyhdrdir/ruby
   -I$rbconfig_rubyhdrdir/ruby/backward"

Modified:
subversion/trunk/build/ac-macros/swig.m4

Modified: subversion/trunk/build/ac-macros/swig.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1875602=1875601=1875602=diff
==
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Tue Mar 24 23:30:21 2020
@@ -230,7 +230,7 @@ AC_DEFUN(SVN_FIND_SWIG,
 AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
 if test -d "$rbconfig_rubyhdrdir"; then
   dnl Ruby >=1.9
-  svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir 
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+  svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
   if test -d "$rbconfig_rubyarchhdrdir"; then
 dnl Ruby >=2.0
 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"

svn commit: r1875230 - /subversion/trunk/subversion/libsvn_subr/cmdline.c

2020-03-15 Thread jamessan

Author: jamessan
Date: Mon Mar 16 04:11:36 2020
New Revision: 1875230

URL: http://svn.apache.org/viewvc?rev=1875230=rev
Log:
Followup to r1874093, add Windows-specific argument escaping

Rather than directly using apr_pescape_shell(), use apr_escape_shell() to give
an indication whether escaping is needed.  If APR reports no escaping is
needed, simply surround the argument in double-quotes to handle any embedded
whitespace.

When escaping is needed, on Unix we continue to use APR's escaping +
post-processing for whitespace.  On Windows, perform the escaping ourselves per
these rules:

  1. Surround the string with double-quotes
  2. Escape any double-quotes or backslashes preceding a double-quote
  3. Escape any metacharacters, including double-quotes, with ^

* subversion/libsvn_subr/cmdline.c
  (escape_path): Refactored as above

Modified:
subversion/trunk/subversion/libsvn_subr/cmdline.c

Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1875230=1875229=1875230=diff
==
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Mon Mar 16 04:11:36 2020
@@ -1305,36 +1305,92 @@ static const char *
 escape_path(apr_pool_t *pool, const char *orig_path)
 {
   apr_size_t len, esc_len;
-  const char *path;
-  char *p, *esc_path;
+  apr_status_t status;
 
-  path = apr_pescape_shell(pool, orig_path);
+  len = strlen(orig_path);
+  esc_len = 0;
 
-  len = esc_len = 0;
+  status = apr_escape_shell(NULL, orig_path, len, _len);
 
-  /* Now that apr has done its escaping, we can check whether there's any
- whitespace that also needs to be escaped.  This must be done after the
- fact, otherwise apr_pescape_shell() would escape the backslashes we're
- inserting. */
-  for (p = (char *)path; *p; p++)
+  if (status == APR_NOTFOUND)
 {
-  len++;
-  if (*p == ' ' || *p == '\t')
-esc_len++;
+  /* No special characters found by APR, so just surround it in double
+ quotes in case there is whitespace, which APR (as of 1.6.5) doesn't
+ consider special. */
+  return apr_psprintf(pool, "\"%s\"", orig_path);
 }
-
-  if (esc_len == 0)
-return path;
-
-  p = esc_path = apr_pcalloc(pool, len + esc_len + 1);
-  while (*path)
+  else
 {
-  if (*path == ' ' || *path == '\t')
-*p++ = '\\';
-  *p++ = *path++;
-}
+#ifdef WIN32
+  const char *p;
+  /* Following the advice from
+ 
https://docs.microsoft.com/en-us/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way
+ 1. Surround argument with double-quotes
+ 2. Escape backslashes, if they're followed by a double-quote, and 
double-quotes
+ 3. Escape any metacharacter, including double-quotes, with ^ */
+
+  /* Use APR's buffer size as an approximation for how large the escaped
+ string should be, plus 4 bytes for the leading/trailing ^" */
+  svn_stringbuf_t *buf = svn_stringbuf_create_ensure(esc_len + 4, pool);
+  svn_stringbuf_appendcstr(buf, "^\"");
+  for (p = orig_path; *p; p++)
+{
+  int nr_backslash = 0;
+  while (*p && *p == '\\')
+{
+  nr_backslash++;
+  p++;
+}
+
+  if (!*p)
+/* We've reached the end of the argument, so we need 2n backslash
+   characters.  That will be interpreted as n backslashes and the
+   final double-quote character will be interpreted as the final
+   string delimiter. */
+svn_stringbuf_appendfill(buf, '\\', nr_backslash * 2);
+  else if (*p == '"')
+{
+  /* Double-quote as part of the argument means we need to double
+ any preceeding backslashes and then add one to escape the
+ double-quote. */
+  svn_stringbuf_appendfill(buf, '\\', nr_backslash * 2 + 1);
+  svn_stringbuf_appendbyte(buf, '^');
+  svn_stringbuf_appendbyte(buf, *p);
+}
+  else
+{
+  /* Since there's no double-quote, we just insert any backslashes
+ literally.  No escaping needed. */
+  svn_stringbuf_appendfill(buf, '\\', nr_backslash);
+  if (strchr("()%!^<>&|", *p))
+svn_stringbuf_appendbyte(buf, '^');
+  svn_stringbuf_appendbyte(buf, *p);
+}
+}
+  svn_stringbuf_appendcstr(buf, "^\"");
+  return buf->data;
+#else
+  char *path, *p, *esc_path;
+
+  /* Account for whitespace, since APR doesn't */
+  for (p = (char *)orig_path; *p; p++)
+if (strchr(" \t\n\r", *p))
+

svn propchange: r1874390 - svn:log

2020-02-22 Thread jamessan

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

Modified: svn:log at Sat Feb 22 21:07:46 2020
--
--- svn:log (original)
+++ svn:log Sat Feb 22 21:07:46 2020
@@ -7,5 +7,5 @@ ConfigParser.SafeConfigParser in Python
 Python 3 for the base class of our Config class.
 
 * tools/hook-scripts/validate-files.py
- (ConfigParser): New valiable to absorb difference of package and class name
+ (ConfigParser): New variable to absorb difference of package and class name
  (class Config): Use ConfigParser as base class

svn commit: r1874094 - in /subversion/trunk: INSTALL build/generator/gen_win_dependencies.py configure.ac get-deps.sh subversion/include/private/svn_dep_compat.h subversion/include/svn_types.h subvers

2020-02-16 Thread jamessan

Author: jamessan
Date: Mon Feb 17 03:49:42 2020
New Revision: 1874094

URL: http://svn.apache.org/viewvc?rev=1874094=rev
Log:
Require at least version 1.5 of APR

Since r1874057, the apr_pescape_shell() API is being used to escape filenames
when invoking $SVN_EDITOR.  This was added to APR in 1.5.0, released on
2013-11-13.

* INSTALL
  (): Document new minimum APR version

* build/generator/gen_win_dependencies.py
  (_find_apr): Bump minimal_apr_version to 1.5.0

* configure.ac
  (APR_VER_REGEXES): Bump minor version in 1.x regex to 1.5

* get-deps.sh:
  (APR_VERSION): Specify 1.5.0 as default version

* subversion/include/private/svn_dep_compat.h
  (apr_time_from_msec): Removed, since it's provided by APR 1.4.0 or later

* subversion/include/svn_types.h
  (apr_hash_this_key, apr_hash_this_key_len, apr_hash_this_val): Remove
   prototypes, since they're provide by APR 1.5.0 or later

* subversion/libsvn_subr/iter.c
  (hash_do_baton): Remove condition requiring APR 1.4.0 to define this type
  (svn_iter_apr_hash): Remove pre-APR 1.4.0 code
  (apr_hash_this_key, apr_hash_this_key_len, apr_hash_this_val): Remove
   definitions, since they're provided by APR 1.5.0 or later

* subversion/libsvn_subr/pool.c
  (apr_pool_create_unmanaged_ex): Remove conditional alias to
   apr_pool_create_core_ex, for APR versions < 1.3.3

Modified:
subversion/trunk/INSTALL
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/configure.ac
subversion/trunk/get-deps.sh
subversion/trunk/subversion/include/private/svn_dep_compat.h
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/libsvn_subr/iter.c
subversion/trunk/subversion/libsvn_subr/pool.c

Modified: subversion/trunk/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1874094=1874093=1874094=diff
==
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Mon Feb 17 03:49:42 2020
@@ -206,7 +206,7 @@ I.INTRODUCTION
   commands described in section II.B before installing the following.
 
 
-  1.  Apache Portable Runtime 1.3 or newer  (REQUIRED)
+  1.  Apache Portable Runtime 1.5 or newer  (REQUIRED)
 
   Whenever you want to build any part of Subversion, you need the
   Apache Portable Runtime (APR) and the APR Utility (APR-util)
@@ -832,7 +832,7 @@ II.   INSTALLATION
 needed to compile Apache.  Note that this is the actual awk program,
 not an installer - just rename it to awk.exe and it is ready to use.
   * Apache apr, apr-util, and optionally apr-iconv libraries, version
-1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
+1.5 or later (1.2 for apr-iconv). If you are building from a Subversion
 checkout and have not downloaded Apache 2, then get these 3 libraries
 from https://www.apache.org/dist/apr/.
   * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1874094=1874093=1874094=diff
==
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Mon Feb 17 
03:49:42 2020
@@ -345,7 +345,7 @@ class GenDependenciesBase(gen_base.Gener
   def _find_apr(self):
 "Find the APR library and version"
 
-minimal_apr_version = (1, 3, 0)
+minimal_apr_version = (1, 5, 0)
 
 if not self.apr_path:
   sys.stderr.write("ERROR: Use '--with-apr' option to configure APR " + \

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1874094=1874093=1874094=diff
==
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Feb 17 03:49:42 2020
@@ -91,7 +91,7 @@ AC_SUBST([MKDIR])
 dnl verify apr version and set apr flags
 dnl These regular expressions should not contain "\(" and "\)".
 
-APR_VER_REGEXES=["1\.[3-9]\. 2\."]
+APR_VER_REGEXES=["1\.[5-9]\. 2\."]
 
 SVN_LIB_APR($APR_VER_REGEXES)
 

Modified: subversion/trunk/get-deps.sh
URL: 
http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1874094=1874093=1874094=diff
==
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Mon Feb 17 03:49:42 2020
@@ -31,7 +31,7 @@
 # features already used in the file.  Reviewing the history of changes
 # may be useful as well.
 
-APR_VERSION=${APR_VERSION:-"1.4.6"}
+APR_VERSION=${APR_VERSION:-"1.5.0"}
 APU_VERSION=${APU_VERSION:-"1.5.1"}
 PY3

svn commit: r1874093 - in /subversion/trunk/subversion: libsvn_subr/cmdline.c tests/cmdline/update_tests.py

2020-02-16 Thread jamessan

Author: jamessan
Date: Mon Feb 17 02:13:34 2020
New Revision: 1874093

URL: http://svn.apache.org/viewvc?rev=1874093=rev
Log:
Followup to r1874057, escape whitespace instead of quoting filename

As danielsh pointed out, only specific characters can be escaped by a backslash
in quoted shell strings.  Rather than surrounding the escaped path with double
quotes, post-process the quoted path and manually escape any whitespace that is
present.

* subversion/libsvn_subr/cmdline.c
  (escape_path): New function, wrapper around apr_pescape_shell(), which
   handles escaping of whitespace.
  (svn_cmdline__edit_file_externally, svn_cmdline__edit_string_externally):
   Call the new function instead of apr_pescape_shell()
* subversion/tests/cmdline/update_tests.py
  (update_accept_conflicts): Include ';' in renamed path ("p; i"), to ensure
   non-whitespace escaping is handled correctly.

Modified:
subversion/trunk/subversion/libsvn_subr/cmdline.c
subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1874093=1874092=1874093=diff
==
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Mon Feb 17 02:13:34 2020
@@ -1234,7 +1234,7 @@ svn_cmdline__be_interactive(svn_boolean_
 }
 
 
-/* Helper for the next two functions.  Set *EDITOR to some path to an
+/* Helper for the edit_externally functions.  Set *EDITOR to some path to an
editor binary.  Sources to search include: the EDITOR_CMD argument
(if not NULL), $SVN_EDITOR, the runtime CONFIG variable (if CONFIG
is not NULL), $VISUAL, $EDITOR.  Return
@@ -1300,6 +1300,42 @@ find_editor_binary(const char **editor,
   return SVN_NO_ERROR;
 }
 
+/* Wrapper around apr_pescape_shell() which also escapes whitespace. */
+static const char *
+escape_path(apr_pool_t *pool, const char *orig_path)
+{
+  apr_size_t len, esc_len;
+  const char *path;
+  char *p, *esc_path;
+
+  path = apr_pescape_shell(pool, orig_path);
+
+  len = esc_len = 0;
+
+  /* Now that apr has done its escaping, we can check whether there's any
+ whitespace that also needs to be escaped.  This must be done after the
+ fact, otherwise apr_pescape_shell() would escape the backslashes we're
+ inserting. */
+  for (p = (char *)path; *p; p++)
+{
+  len++;
+  if (*p == ' ' || *p == '\t')
+esc_len++;
+}
+
+  if (esc_len == 0)
+return path;
+
+  p = esc_path = apr_pcalloc(pool, len + esc_len + 1);
+  while (*path)
+{
+  if (*path == ' ' || *path == '\t')
+*p++ = '\\';
+  *p++ = *path++;
+}
+
+  return esc_path;
+}
 
 svn_error_t *
 svn_cmdline__edit_file_externally(const char *path,
@@ -1333,8 +1369,7 @@ svn_cmdline__edit_file_externally(const
 
   /* editor is explicitly documented as being interpreted by the user's shell,
  and as such should already be quoted/escaped as needed. */
-  cmd = apr_psprintf(pool, "%s \"%s\"", editor,
- apr_pescape_shell(pool, file_name));
+  cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, file_name));
   sys_err = system(cmd);
 
   apr_err = apr_filepath_set(old_cwd, pool);
@@ -1496,8 +1531,7 @@ svn_cmdline__edit_string_externally(svn_
 
   /* editor is explicitly documented as being interpreted by the user's shell,
  and as such should already be quoted/escaped as needed. */
-  cmd = apr_psprintf(pool, "%s \"%s\"", editor,
- apr_pescape_shell(pool, tmpfile_native));
+  cmd = apr_psprintf(pool, "%s %s", editor, escape_path(pool, tmpfile_native));
 
   /* If the caller wants us to leave the file around, return the path
  of the file we'll use, and make a note not to destroy it.  */

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1874093=1874092=1874093=diff
==
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Feb 17 
02:13:34 2020
@@ -3649,12 +3649,12 @@ def update_accept_conflicts(sbox):
   alpha_path = sbox.ospath('A/B/E/alpha')
   beta_path = sbox.ospath('A/B/E/beta')
   pi_path = sbox.ospath('A/D/G/pi')
-  p_i_path = sbox.ospath('A/D/G/p i')
+  p_i_path = sbox.ospath('A/D/G/p; i')
   rho_path = sbox.ospath('A/D/G/rho')
 
-  # Rename pi to "p i" so we can exercise SVN_EDITOR's handling of paths with
-  # whitespace
-  sbox.simple_move('A/D/G/pi', 'A/D/G/p i')
+  # Rename pi to "p; i" so we can exercise SVN_EDITOR's handling of paths with
+  # special characters
+  sbox.simple_move('A/D

svn commit: r1874057 - in /subversion/trunk/subversion: libsvn_subr/cmdline.c tests/cmdline/update_tests.py

2020-02-15 Thread jamessan

Author: jamessan
Date: Sat Feb 15 16:24:53 2020
New Revision: 1874057

URL: http://svn.apache.org/viewvc?rev=1874057=rev
Log:
Escape filenames when invoking $SVN_EDITOR

Per https://subversion.apache.org/faq.html#svn-editor, $SVN_EDITOR is invoked
through the shell instead of directly executed.  The user is expected to
properly escape/quote $SVN_EDITOR, but svn was putting the filename directly
into the command without any escaping.  This therefore breaks attempts to,
e.g., run the editor from the merge conflict dialog when a path has special
characters.

Update locations where we invoke the editor to quote the filename as well as
escape shell special characters using apr_pescape_shell().  The quotes are
needed in addition to the escaping, since apr_pescape_shell() does not escape
whitespace.

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline__edit_file_externally, svn_cmdline__edit_string_externally):
   Quote and escape, via apr_pescape_shell(), the filename in the command line.
* subversion/tests/cmdline/update_test.py
  (update_accept_conflicts): Rename "A/D/G/pi" to "A/D/G/p i" before performing
   the merge, so the test exercises the changes above.

Modified:
subversion/trunk/subversion/libsvn_subr/cmdline.c
subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/libsvn_subr/cmdline.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cmdline.c?rev=1874057=1874056=1874057=diff
==
--- subversion/trunk/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cmdline.c Sat Feb 15 16:24:53 2020
@@ -39,6 +39,7 @@
 
 #include /* for STDIN_FILENO */
 #include   /* for apr_strerror */
+#include 
 #include /* for apr_initialize/apr_terminate */
 #include /* for apr_snprintf */
 #include 
@@ -1330,7 +1331,10 @@ svn_cmdline__edit_file_externally(const
 return svn_error_wrap_apr
   (apr_err, _("Can't change working directory to '%s'"), base_dir);
 
-  cmd = apr_psprintf(pool, "%s %s", editor, file_name);
+  /* editor is explicitly documented as being interpreted by the user's shell,
+ and as such should already be quoted/escaped as needed. */
+  cmd = apr_psprintf(pool, "%s \"%s\"", editor,
+ apr_pescape_shell(pool, file_name));
   sys_err = system(cmd);
 
   apr_err = apr_filepath_set(old_cwd, pool);
@@ -1489,7 +1493,11 @@ svn_cmdline__edit_string_externally(svn_
   err = svn_utf_cstring_from_utf8(_native, tmpfile_name, pool);
   if (err)
 goto cleanup;
-  cmd = apr_psprintf(pool, "%s %s", editor, tmpfile_native);
+
+  /* editor is explicitly documented as being interpreted by the user's shell,
+ and as such should already be quoted/escaped as needed. */
+  cmd = apr_psprintf(pool, "%s \"%s\"", editor,
+ apr_pescape_shell(pool, tmpfile_native));
 
   /* If the caller wants us to leave the file around, return the path
  of the file we'll use, and make a note not to destroy it.  */

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1874057=1874056=1874057=diff
==
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Feb 15 
16:24:53 2020
@@ -3642,10 +3642,6 @@ def update_accept_conflicts(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  # Make a backup copy of the working copy
-  wc_backup = sbox.add_wc_path('backup')
-  svntest.actions.duplicate_dir(wc_dir, wc_backup)
-
   # Make a few local mods to files which will be committed
   iota_path = sbox.ospath('iota')
   lambda_path = sbox.ospath('A/B/lambda')
@@ -3653,13 +3649,25 @@ def update_accept_conflicts(sbox):
   alpha_path = sbox.ospath('A/B/E/alpha')
   beta_path = sbox.ospath('A/B/E/beta')
   pi_path = sbox.ospath('A/D/G/pi')
+  p_i_path = sbox.ospath('A/D/G/p i')
   rho_path = sbox.ospath('A/D/G/rho')
+
+  # Rename pi to "p i" so we can exercise SVN_EDITOR's handling of paths with
+  # whitespace
+  sbox.simple_move('A/D/G/pi', 'A/D/G/p i')
+  sbox.simple_commit()
+  sbox.simple_update()
+
+  # Make a backup copy of the working copy
+  wc_backup = sbox.add_wc_path('backup')
+  svntest.actions.duplicate_dir(wc_dir, wc_backup)
+
   svntest.main.file_append(lambda_path, 'Their appended text for lambda\n')
   svntest.main.file_append(iota_path, 'Their appended text for iota\n')
   svntest.main.file_append(mu_path, 'Their appended text for mu\n')
   svntest.main.file_append(alpha_path, 'Their appended text for alpha\n')
   svntest.main.file_append(beta_path, 'Their appended text for beta\n')
-  sv

svn commit: r1870782 - /subversion/trunk/tools/dist/backport.pl

2019-12-03 Thread jamessan

Author: jamessan
Date: Wed Dec  4 03:08:38 2019
New Revision: 1870782

URL: http://svn.apache.org/viewvc?rev=1870782=rev
Log:
* tools/dist/backport.pl: Continue chasing the experimental nature of 'given'
and 'when', through perl5300delta.

Modified:
subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1870782=1870781=1870782=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Dec  4 03:08:38 2019
@@ -9,11 +9,11 @@ use v5.10.0; # needed for $^V
 # experimental and "subject to change" in v5.18 (see perl5180delta).  Every
 # use of it now triggers a warning.
 #
-# As of Perl v5.26.1, the semantics of given/when provided by Perl are
+# As of Perl v5.30.0, the semantics of given/when provided by Perl are
 # compatible with those expected by the script, so disable the warning for
 # those Perls.  But don't try to disable the the warning category on Perls
 # that don't know that category, since that breaks compilation.
-no if (v5.17.0 le $^V and $^V le v5.26.1),
+no if (v5.17.0 le $^V and $^V le v5.30.0),
warnings => 'experimental::smartmatch';
 
 # Licensed to the Apache Software Foundation (ASF) under one

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

2019-12-03 Thread jamessan

Author: jamessan
Date: Wed Dec  4 03:03:42 2019
New Revision: 1870781

URL: http://svn.apache.org/viewvc?rev=1870781=rev
Log:
* STATUS:
  Vote +1 on the r1865987 group.
  Vote +1 on r1868151, approving.

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=1870781=1870780=1870781=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Dec  4 03:03:42 2019
@@ -20,17 +20,18 @@ Candidate changes:
Justification:
  Could cause wroung output or uninitialised memory read on some platforms.
Votes:
- +1: brane
+ +1: brane, jamessan
+
+Veto-blocked changes:
+=
+
+Approved changes:
+=
 
  * r1868151
Fix syntax error when $PYTHON is Python 3.
Justification:
  Python 2 will reach EOL during the lifetime of this branch.
Votes:
- +1: danielsh
+ +1: danielsh, jamessan
 
-Veto-blocked changes:
-=
-
-Approved changes:
-=

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

2019-12-03 Thread jamessan

Author: jamessan
Date: Wed Dec  4 03:00:44 2019
New Revision: 1870780

URL: http://svn.apache.org/viewvc?rev=1870780=rev
Log:
* STATUS:
  Vote +1 on r1851903, approving.
  Vote +1 on r1853450, approving.
  Vote +1 on r1856397.

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870780=1870779=1870780=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Dec  4 03:00:44 2019
@@ -14,13 +14,6 @@ Status of 1.11.2:
 Candidate changes:
 ==
 
- * r1851903
-   Fix missing unlock of working copy in a resolver error case.
-   Justification:
- Could force users to run 'svn cleanup' unnecessarily.
-   Votes:
- +1: stsp, rhuijben
-
  * r1851920
Remove a useless common ancestor search from the conflict resolver.
Justification:
@@ -40,13 +33,6 @@ Candidate changes:
  +1: stsp
  -0: rhuijben (I would recommend setting a proper svn:ignore instead)
 
- * r1853450
-   Enable 'incoming_move_file_merge' option only if local change is file edit.
-   Justification:
- Conflict resolver misbehaves when it runs into move vs move conflicts.
-   Votes:
- +1: stsp, rhuijben
-
  * r1855419
Fix conflict resolver bug where local and incoming edits got swapped.
Justification:
@@ -62,10 +48,25 @@ Candidate changes:
Justification:
  Makes it easier to build Subversion on Windows. Simple local fix.
Votes:
- +1: rhuijben
+ +1: rhuijben, jamessan
 
 Veto-blocked changes:
 =
 
 Approved changes:
 =
+
+ * r1851903
+   Fix missing unlock of working copy in a resolver error case.
+   Justification:
+ Could force users to run 'svn cleanup' unnecessarily.
+   Votes:
+ +1: stsp, rhuijben, jamessan
+
+ * r1853450
+   Enable 'incoming_move_file_merge' option only if local change is file edit.
+   Justification:
+ Conflict resolver misbehaves when it runs into move vs move conflicts.
+   Votes:
+ +1: stsp, rhuijben, jamessan
+

svn commit: r1870779 - /subversion/branches/1.13.x/STATUS

2019-12-03 Thread jamessan

Author: jamessan
Date: Wed Dec  4 02:44:49 2019
New Revision: 1870779

URL: http://svn.apache.org/viewvc?rev=1870779=rev
Log:
* STATUS: Approve the r1870393 group.

Modified:
subversion/branches/1.13.x/STATUS

Modified: subversion/branches/1.13.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.13.x/STATUS?rev=1870779=1870778=1870779=diff
==
--- subversion/branches/1.13.x/STATUS (original)
+++ subversion/branches/1.13.x/STATUS Wed Dec  4 02:44:49 2019
@@ -15,6 +15,11 @@ Status of 1.13.1:
 Candidate changes:
 ==
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
 
  * r1870393, r1870395
Fix issue #4837 'Cannot get info for a file that was
@@ -22,11 +27,5 @@ Candidate changes:
Justification:
  Regression introduced in 1.10.0.
Votes:
- +1: julianfoad, rhuijben
+ +1: julianfoad, rhuijben, jamessan
 
-Veto-blocked changes:
-=
-
-
-Approved changes:
-=

svn commit: r1870039 - in /subversion/trunk: contrib/client-side/ subversion/include/ subversion/libsvn_repos/ subversion/po/ subversion/svnadmin/ subversion/tests/libsvn_client/

2019-11-19 Thread jamessan

Author: jamessan
Date: Wed Nov 20 04:26:16 2019
New Revision: 1870039

URL: http://svn.apache.org/viewvc?rev=1870039=rev
Log:
Various spelling fixes, no functional change

* contrib/client-side/svn-clean
  (--exclude): s/exluded/excluded/

* subversion/include/svn_error_codes.h
  (SVN_ERR_X509_CERT_VERIFY_FAILED): s/Certficate/Certificate/

* subversion/po/de.po,
  subversion/po/ja.po,
  subversion/po/ko.po,
  subversion/po/pl.po,
  subversion/po/sv.po:
  (): s/Certficate/Certificate/; s/abandonded/abandoned/

* subversion/libsvn_repos/repos.c:
  (): s/abandonded/abandoned/

* subversion/libsvn_repos/repos.c,
  subversion/svnadmin/svnadmin.c,
  subversion/tests/libsvn_client/client-test.c:
  (): s/filesytem/filesystem/

Modified:
subversion/trunk/contrib/client-side/svn-clean
subversion/trunk/subversion/include/svn_error_codes.h
subversion/trunk/subversion/libsvn_repos/repos.c
subversion/trunk/subversion/po/de.po
subversion/trunk/subversion/po/ja.po
subversion/trunk/subversion/po/ko.po
subversion/trunk/subversion/po/pl.po
subversion/trunk/subversion/po/sv.po
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/tests/libsvn_client/client-test.c

Modified: subversion/trunk/contrib/client-side/svn-clean
URL: 
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn-clean?rev=1870039=1870038=1870039=diff
==
--- subversion/trunk/contrib/client-side/svn-clean (original)
+++ subversion/trunk/contrib/client-side/svn-clean Wed Nov 20 04:26:16 2019
@@ -180,7 +180,7 @@ faster than parsing the output of the B<
 
 =item B<-e>, B<--exclude>
 
-A regular expression for filenames to be exluded. For example, the following
+A regular expression for filenames to be excluded. For example, the following
 command will skip files ending in ".zip":
 
 =over 8

Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1870039=1870038=1870039=diff
==
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Wed Nov 20 04:26:16 
2019
@@ -1779,7 +1779,7 @@ SVN_ERROR_START
 
   SVN_ERRDEF(SVN_ERR_X509_CERT_VERIFY_FAILED,
  SVN_ERR_X509_CATEGORY_START + 19,
- "Certficate verification failed")
+ "Certificate verification failed")
 
 SVN_ERROR_END
 

Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1870039=1870038=1870039=diff
==
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Wed Nov 20 04:26:16 2019
@@ -1183,7 +1183,7 @@ svn_repos_create(svn_repos_t **repos_p,
   if ((err = svn_fs_create2(>fs, repos->db_path, fs_config,
 result_pool, scratch_pool)))
 {
-  /* If there was an error making the filesytem, e.g. unknown/supported
+  /* If there was an error making the filesystem, e.g. unknown/supported
* filesystem type.  Clean up after ourselves.  Yes this is safe because
* create_repos_structure will fail if the path existed before we started
* so we can't accidentally remove a directory that previously existed.

Modified: subversion/trunk/subversion/po/de.po
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/de.po?rev=1870039=1870038=1870039=diff
==
--- subversion/trunk/subversion/po/de.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/de.po [UTF-8] Wed Nov 20 04:26:16 2019
@@ -1556,7 +1556,7 @@ msgid "Certificate signature mismatch"
 msgstr "Signatur des Zertifikats stimmt nicht überein"
 
 #: ../include/svn_error_codes.h:1772
-msgid "Certficate verification failed"
+msgid "Certificate verification failed"
 msgstr "Überprüfung des Zertifikats fehlgeschlagen"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290
@@ -17977,7 +17977,7 @@ msgid ""
 "Print the names of uncommitted transactions. With -rN skip the output\n"
 "of those that have a base revision more recent than rN.  Transactions\n"
 "with base revisions much older than HEAD are likely to have been\n"
-"abandonded and are candidates to be removed.\n"
+"abandoned and are candidates to be removed.\n"
 msgstr ""
 
 #: ../svnadmin/svnadmin.c:501

Modified: subversion/trunk/subversion/po/ja.po
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/ja.po?rev=1870039=1870038=1

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

2019-07-30 Thread jamessan

Author: jamessan
Date: Tue Jul 30 12:16:12 2019
New Revision: 1863993

URL: http://svn.apache.org/viewvc?rev=1863993=rev
Log:
* STATUS: Nominate r1863987, r1863990.

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=1863993=1863992=1863993=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jul 30 12:16:12 2019
@@ -15,6 +15,13 @@ Status of 1.10.7:
 Candidate changes:
 ==
 
+ * r1863987, r1863990
+   Fix format of Requires(.private) fields in pkg-config files
+   Justification:
+ Fixes format of .pc files and specifies correct include/link flags
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1863992 - /subversion/branches/1.12.x/STATUS

2019-07-30 Thread jamessan

Author: jamessan
Date: Tue Jul 30 12:14:17 2019
New Revision: 1863992

URL: http://svn.apache.org/viewvc?rev=1863992=rev
Log:
* STATUS: Nominate r1863987, r1863990.

Modified:
subversion/branches/1.12.x/STATUS

Modified: subversion/branches/1.12.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.12.x/STATUS?rev=1863992=1863991=1863992=diff
==
--- subversion/branches/1.12.x/STATUS (original)
+++ subversion/branches/1.12.x/STATUS Tue Jul 30 12:14:17 2019
@@ -15,6 +15,13 @@ Status of 1.12.3:
 Candidate changes:
 ==
 
+ * r1863987, r1863990
+   Fix format of Requires(.private) fields in pkg-config files
+   Justification:
+ Fixes format of .pc files and specifies correct include/link flags
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1863990 - in /subversion/trunk/build/generator: gen_make.py templates/pkg-config.in.ezt

2019-07-30 Thread jamessan

Author: jamessan
Date: Tue Jul 30 11:44:37 2019
New Revision: 1863990

URL: http://svn.apache.org/viewvc?rev=1863990=rev
Log:
Fix link flags and include directory in pkg-config template

* build/generator/gen_make.py
  (write_pkg_config_dot_in_files): Add version variable for template.
   Include version in link flag for svn lib.

* build/generator/templates/pkg-config.in.ezt:
  (): Add /subversion-1 to include path

Modified:
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/generator/templates/pkg-config.in.ezt

Modified: subversion/trunk/build/generator/gen_make.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1863990=1863989=1863990=diff
==
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Tue Jul 30 11:44:37 2019
@@ -633,9 +633,10 @@ DIR=`pwd`
 lib_deps=[],
 lib_required=[],
 lib_required_private=[],
+version=self.version,
 )
-  # libsvn_foo -> -lsvn_foo
-  data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1))
+  # libsvn_foo -> -lsvn_foo-1
+  data.lib_deps.append('-l%s-%s' % (lib_name.replace('lib', '', 1), 
data.version))
   for lib_dep in lib_deps.split():
 if lib_dep == 'apriconv':
   # apriconv is part of apr-util, skip it

Modified: subversion/trunk/build/generator/templates/pkg-config.in.ezt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/pkg-config.in.ezt?rev=1863990=1863989=1863990=diff
==
--- subversion/trunk/build/generator/templates/pkg-config.in.ezt (original)
+++ subversion/trunk/build/generator/templates/pkg-config.in.ezt Tue Jul 30 
11:44:37 2019
@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
 Requires: [for lib_required][if-index lib_required first][else], 
[end][lib_required][end]
 Requires.private: [for lib_required_private][if-index lib_required_private 
first][else], [end][lib_required_private][end]
 Libs: -L${libdir} [for lib_deps] [lib_deps][end]
-Cflags: -I${includedir}
+Cflags: -I${includedir}/subversion-[version]

svn commit: r1863987 - in /subversion/trunk: build/generator/templates/pkg-config.in.ezt configure.ac

2019-07-30 Thread jamessan

Author: jamessan
Date: Tue Jul 30 11:07:32 2019
New Revision: 1863987

URL: http://svn.apache.org/viewvc?rev=1863987=rev
Log:
Fix format of Requires(.private) fields in pkg-config files

Per pkg-config(1), the field "is a comma-separated list of packages that are
required by your package", not a space-separated field.

* build/generator/templates/pkg-config.in.ezt
  (): Generate comma-separated lists for Requires(.private)

* configure.ac:
  (old_gnome_keyring): Use a comma separated list for SVN_GNOME_KEYRING_PCLIBS

Modified:
subversion/trunk/build/generator/templates/pkg-config.in.ezt
subversion/trunk/configure.ac

Modified: subversion/trunk/build/generator/templates/pkg-config.in.ezt
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/pkg-config.in.ezt?rev=1863987=1863986=1863987=diff
==
--- subversion/trunk/build/generator/templates/pkg-config.in.ezt (original)
+++ subversion/trunk/build/generator/templates/pkg-config.in.ezt Tue Jul 30 
11:07:32 2019
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: [lib_name]
 Description: [lib_desc]
 Version: @PACKAGE_VERSION@
-Requires: [for lib_required] [lib_required][end]
-Requires.private: [for lib_required_private] [lib_required_private][end]
+Requires: [for lib_required][if-index lib_required first][else], 
[end][lib_required][end]
+Requires.private: [for lib_required_private][if-index lib_required_private 
first][else], [end][lib_required_private][end]
 Libs: -L${libdir} [for lib_deps] [lib_deps][end]
 Cflags: -I${includedir}

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1863987=1863986=1863987=diff
==
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Tue Jul 30 11:07:32 2019
@@ -593,7 +593,7 @@ if test "$with_old_gnome_keyring" != "no
 [Is GNOME Keyring support enabled?])
   CPPFLAGS="$old_CPPFLAGS"
   SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 
gnome-keyring-1`"
-  SVN_GNOME_KEYRING_PCLIBS="glib-2.0 gnome-keyring-1"
+  SVN_GNOME_KEYRING_PCLIBS="glib-2.0, gnome-keyring-1"
 else
   AC_MSG_RESULT([no])
   if test "$with_old_gnome_keyring" = "yes"; then

svn propchange: r1860958 - svn:log

2019-07-27 Thread jamessan

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

Modified: svn:log at Sun Jul 28 03:32:30 2019
--
--- svn:log (original)
+++ svn:log Sun Jul 28 03:32:30 2019
@@ -5,5 +5,5 @@ before, but now it is done in the same w
 logging now happens higher up the call stack.)
 
 * subversion/svnserve/serve.c
-  After reporting an error to the client, don't log it explicity here and
+  After reporting an error to the client, don't log it explicitly here and
   then clear it; instead return it so the caller can do so.

svn commit: r1849449 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/types/ tests/org/apache/subversion/javahl/

2018-12-20 Thread jamessan

Author: jamessan
Date: Fri Dec 21 04:21:55 2018
New Revision: 1849449

URL: http://svn.apache.org/viewvc?rev=1849449=rev
Log:
Fix various warnings in javahl

[in subversion/bindings/javahl]
* src/org/apache/subversion/javahl/types/RevisionRange.java,
  tests/org/apache/subversion/javahl/BasicTests.java,
  tests/org/apache/subversion/javahl/SVNRemoteTests.java:
Use "Long.valueOf(long)" instead of deprecated "new Long(long)"

* native/RemoteSession.cpp, native/RemoteSession.h,
  native/org_apache_subversion_javahl_remote_RemoteSession.cpp,
  native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp,
  native/org_apache_subversion_javahl_util_PropLib.cpp: Rename "jvalue"
variables to fix -Wshadow warnings for jvalue symbol in jni.h

Modified:
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h

subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp

subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp

subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java

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

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

Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1849449=1849448=1849449=diff
==
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp Fri 
Dec 21 04:21:55 2018
@@ -427,31 +427,31 @@ byte_array_to_svn_string(JNIByteArray& a
 void
 RemoteSession::changeRevisionProperty(
 jlong jrevision, jstring jname,
-jbyteArray jold_value, jbyteArray jvalue)
+jbyteArray jold_propval, jbyteArray jpropval)
 {
   JNIStringHolder name(jname);
   if (JNIUtil::isExceptionThrown())
 return;
 
-  JNIByteArray old_value(jold_value);
+  JNIByteArray old_propval(jold_propval);
   if (JNIUtil::isExceptionThrown())
 return;
 
-  JNIByteArray value(jvalue);
+  JNIByteArray propval(jpropval);
   if (JNIUtil::isExceptionThrown())
 return;
 
   SVN::Pool subPool(pool);
-  svn_string_t* const* p_old_value = NULL;
-  svn_string_t* const str_old_value =
-byte_array_to_svn_string(old_value, subPool);
-  if (str_old_value)
-p_old_value = _old_value;
+  svn_string_t* const* p_old_propval = NULL;
+  svn_string_t* const str_old_propval =
+byte_array_to_svn_string(old_propval, subPool);
+  if (str_old_propval)
+p_old_propval = _old_propval;
 
   SVN_JNI_ERR(svn_ra_change_rev_prop2(m_session,
   svn_revnum_t(jrevision),
-  name, p_old_value,
-  byte_array_to_svn_string(value, subPool),
+  name, p_old_propval,
+  byte_array_to_svn_string(propval, 
subPool),
   subPool.getPool()), );
 }
 

Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h?rev=1849449=1849448=1849449=diff
==
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h 
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h Fri Dec 
21 04:21:55 2018
@@ -71,8 +71,8 @@ class RemoteSession : public SVNBase
 jlong getLatestRevision();
 jlong getRevisionByTimestamp(jlong jtimestamp);
 void changeRevisionProperty(jlong jrevision, jstring jname,
-jbyteArray jold_value,
-jbyteArray jvalue);
+jbyteArray jold_propval,
+jbyteArray jpropval);
 jobject getRevisionProperties(jlong jrevision);
 jbyteArray getRevisionProperty(jlong jrevision, jstring jname);
 jlong getFile(jlong jrevision, jstring jpath,

Modified: 
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp?rev=1849449=1849448=1849449=diff
==
--- 
subversion/trunk

svn propchange: r1845872 - svn:log

2018-11-06 Thread jamessan

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

Modified: svn:log at Tue Nov  6 18:38:35 2018
--
--- svn:log (original)
+++ svn:log Tue Nov  6 18:38:35 2018
@@ -1,4 +1,4 @@
-Tests should be able to use the trojan-tree virgunal state.
+Tests should be able to use the trojan-tree virginal state.
 
 * subversion/tests/cmdline/svntest/actions.py
   (get_virginal_state): Add parameter 'tree' which defaults to 'greek'.

svn propchange: r1845499 - svn:log

2018-11-01 Thread jamessan

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

Modified: svn:log at Thu Nov  1 21:52:43 2018
--
--- svn:log (original)
+++ svn:log Thu Nov  1 21:52:43 2018
@@ -1,4 +1,4 @@
-Move the detaulsd description of the --show-item option to the
+Move the detailed description of the --show-item option to the
 help text for the 'info' command.
 
 * subversion/svn/svn.c

svn commit: r1843373 - /subversion/site/publish/site-nav.html

2018-10-09 Thread jamessan

Author: jamessan
Date: Wed Oct 10 02:28:21 2018
New Revision: 1843373

URL: http://svn.apache.org/viewvc?rev=1843373=rev
Log:
* site-nav.html: Bump the copyright year in the navigation.

Modified:
subversion/site/publish/site-nav.html

Modified: subversion/site/publish/site-nav.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/site-nav.html?rev=1843373=1843372=1843373=diff
==
--- subversion/site/publish/site-nav.html (original)
+++ subversion/site/publish/site-nav.html Wed Oct 10 02:28:21 2018
@@ -67,7 +67,7 @@
  
 
 
-Copyright  2017 https://www.apache.org/;>The Apache
+Copyright  2018 https://www.apache.org/;>The Apache
Software Foundation, Licensed under
the https://www.apache.org/licenses/LICENSE-2.0; >Apache
License, Version 2.0.  Apache, Apache Subversion, and

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

2018-09-27 Thread jamessan

Author: jamessan
Date: Thu Sep 27 11:52:43 2018
New Revision: 1842087

URL: http://svn.apache.org/viewvc?rev=1842087=rev
Log:
* publish/docs/release-notes/1.11.html
  (javahl): New section, document Java 10 compatibility and Java 8 build
   requirement.

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

Modified: subversion/site/publish/docs/release-notes/1.11.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.11.html?rev=1842087=1842086=1842087=diff
==
--- subversion/site/publish/docs/release-notes/1.11.html (original)
+++ subversion/site/publish/docs/release-notes/1.11.html Thu Sep 27 11:52:43 
2018
@@ -485,6 +485,26 @@ commands.
 
  
 
+
+API changes, improvements and language bindings
+(client and server)
+  
+
+
+
+JavaHL Updates
+  
+
+
+The JavaHL bindings have been updated to be compatible with Java 10.  Due
+to required build changes, JavaHL now requires at least Java 8 to compile.
+
+  
+
+  
+

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

2018-09-21 Thread jamessan

Author: jamessan
Date: Fri Sep 21 19:14:17 2018
New Revision: 1841631

URL: http://svn.apache.org/viewvc?rev=1841631=rev
Log:
* STATUS: Vote +1 on the r1841059 group, approving.

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841631=1841630=1841631=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 21 19:14:17 2018
@@ -30,19 +30,6 @@ Candidate changes:
  +0: julianfoad (only r1840990,r1840991)
  +1: stsp
 
- * r1841059,r1841600,r1841601,r1841602,r1841606
-   Change the shelf storage dir from ".svn/shelves" to
-   ".svn/experimental/shelves/v2".
-   Justification:
- Stop polluting the ".svn/" namespace with an experimental "shelves" 
subdir.
- Instead use a subdir intended for anything experimental/unstable.
- Also fixes SVN-4774 "presence of old 1.10 shelves breaks shelf-list",
- giving a cleaner upgrade path for those testing experimental shelving.
-   Votes:
- +1: julianfoad
- -0: jamessan (only r1841059,r1841606) (svn_wc__get_shelves_dir is still 
using .svn/x/)
- +1: steveking
-
  * r1841079,r1841481,r1841567
Move all experimental APIs to the private namespace.
Justification:
@@ -68,3 +55,15 @@ Veto-blocked changes:
 Approved changes:
 =
 
+ * r1841059,r1841600,r1841601,r1841602,r1841606
+   Change the shelf storage dir from ".svn/shelves" to
+   ".svn/experimental/shelves/v2".
+   Justification:
+ Stop polluting the ".svn/" namespace with an experimental "shelves" 
subdir.
+ Instead use a subdir intended for anything experimental/unstable.
+ Also fixes SVN-4774 "presence of old 1.10 shelves breaks shelf-list",
+ giving a cleaner upgrade path for those testing experimental shelving.
+   Votes:
+ +1: julianfoad, jamessan
+ +1: steveking
+

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

2018-09-21 Thread jamessan

Author: jamessan
Date: Fri Sep 21 17:07:14 2018
New Revision: 1841617

URL: http://svn.apache.org/viewvc?rev=1841617=rev
Log:
* STATUS: Unapprove r1841180 group since it needs 3 votes due to touching build 
system

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841617=1841616=1841617=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 21 17:07:14 2018
@@ -54,18 +54,17 @@ Candidate changes:
Votes:
  +1: julianfoad, brane
 
-Veto-blocked changes:
-=
-
-Approved changes:
-=
-
  * r1841180, r1841524, r1841525
Merge the 'java10-compat' branch to trunk
Justification:
  Enables building against Java 10 which is becoming the default JDK in
  many distributions
Votes:
- +1 (without r1841524, r1841525): jamessan
  +1: jcorvel, jamessan
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+

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

2018-09-21 Thread jamessan

Author: jamessan
Date: Fri Sep 21 17:01:17 2018
New Revision: 1841615

URL: http://svn.apache.org/viewvc?rev=1841615=rev
Log:
* STATUS:
  Vote +1 on the r1841180 group, approving.
  Vote -0 on the r1841059 group, merge conflicts and .svn/x/ is still being used

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841615=1841614=1841615=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 21 17:01:17 2018
@@ -40,18 +40,9 @@ Candidate changes:
  giving a cleaner upgrade path for those testing experimental shelving.
Votes:
  +1: julianfoad
- +1: jamessan (r1841059 only)
+ -0: jamessan (svn_wc__get_shelves_dir is still using .svn/x/)
  +1: steveking
 
- * r1841180, r1841524, r1841525
-   Merge the 'java10-compat' branch to trunk
-   Justification:
- Enables building against Java 10 which is becoming the default JDK in
- many distributions
-   Votes:
- +1 (without r1841524, r1841525): jamessan
- +1: jcorvel
-
  * r1841079,r1841481,r1841567
Move all experimental APIs to the private namespace.
Justification:
@@ -68,3 +59,13 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+ * r1841180, r1841524, r1841525
+   Merge the 'java10-compat' branch to trunk
+   Justification:
+ Enables building against Java 10 which is becoming the default JDK in
+ many distributions
+   Votes:
+ +1 (without r1841524, r1841525): jamessan
+ +1: jcorvel, jamessan
+

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

2018-09-20 Thread jamessan

Author: jamessan
Date: Thu Sep 20 13:42:17 2018
New Revision: 1841475

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

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841475=1841474=1841475=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Thu Sep 20 13:42:17 2018
@@ -60,6 +60,14 @@ Candidate changes:
Votes:
  +1: danielsh, jamessan
 
+ * r1841180
+   Merge the 'java10-compat' branch to trunk
+   Justification:
+ Enables building against Java 10 which is becoming the default JDK in
+ many distributions
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

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

2018-09-20 Thread jamessan

Author: jamessan
Date: Thu Sep 20 13:35:33 2018
New Revision: 1841473

URL: http://svn.apache.org/viewvc?rev=1841473=rev
Log:
* STATUS:
  Vote +1 on r1841059.
  Vote +1 on the r1841091 group.
  Vote +1 on r1841098.
  Vote +1 on r1841272.

Modified:
subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841473=1841472=1841473=diff
==
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Thu Sep 20 13:35:33 2018
@@ -35,21 +35,21 @@ Candidate changes:
  A cleaner upgrade path for those testing experimental shelving. Changes
  the shelf storage dir to '.svn/x/shelves/v2'.
Votes:
- +1: julianfoad
+ +1: julianfoad, jamessan
 
  * r1841091, r1841136
Fix SVN-4776: Shelving: remove non-x-prefixed command aliases.
Justification:
  Leaves the command-line UI clear for a future stable version.
Votes:
- +1: julianfoad
+ +1: julianfoad, jamessan
 
  * r1841098
Rename --viewspec to --x-viewspec.  See SVN-4776.
Justification:
  Move experimental interfaces to a separate namespace.
Votes:
- +1: danielsh
+ +1: danielsh, jamessan
 
  * r1841272
'svn info --x-viewspec': Expose both output backends.
@@ -58,11 +58,10 @@ Candidate changes:
  feedback. (Or possibly just fall prey to the sunk cost fallacy.)
Depends: r1841098
Votes:
- +1: danielsh
+ +1: danielsh, jamessan
 
 Veto-blocked changes:
 =
 
-
 Approved changes:
 =

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

2018-09-17 Thread jamessan

Author: jamessan
Date: Tue Sep 18 02:05:41 2018
New Revision: 1841181

URL: http://svn.apache.org/viewvc?rev=1841181=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

2018-09-17 Thread jamessan

Author: jamessan
Date: Tue Sep 18 02:01:25 2018
New Revision: 1841180

URL: http://svn.apache.org/viewvc?rev=1841180=rev
Log:
Merge the 'java10-compat' branch to trunk

Modified:
subversion/trunk/   (props changed)
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_base.py
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/generator/templates/build-outputs.mk.ezt

Propchange: subversion/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 18 02:01:25 2018
@@ -54,6 +54,7 @@
 /subversion/branches/issue-3975:1152931-1160746
 /subversion/branches/issue-4116-dev:1424719-1425040
 /subversion/branches/issue-4194-dev:1410507-1414880
+/subversion/branches/java10-compat:1840620-1841179
 /subversion/branches/javahl-ra:991978-1494640
 /subversion/branches/kwallet:870785-871314
 /subversion/branches/log-addressing:1509279-1546844

Modified: subversion/trunk/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1841180=1841179=1841180=diff
==
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Sep 18 02:01:25 2018
@@ -218,7 +218,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS)
 # special compilation for files destined for javahl (i.e. C++)
 COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) 
$(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
-COMPILE_JAVAHL_JAVAH = $(JAVAH)
 COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
 
 # On Mac OS X, export an env variable so that the tests can run without
@@ -393,7 +392,6 @@ JAVAC = @JAVAC@
 JAVADOC = @JAVADOC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
-JAVAH = @JAVAH@
 JAR = @JAR@
 
 JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
@@ -494,8 +492,8 @@ revision-install:
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah 
javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib 
@JAVAHL_TESTS_TARGET@ javahl-compat
-install-javahl: javahl install-javahl-java install-javahl-javah 
install-javahl-lib
+javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java 
javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ 
javahl-compat
+install-javahl: javahl install-javahl-java install-javahl-lib
 javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
 
 clean-javahl:

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1841180=1841179=1841180=diff
==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Sep 18 02:01:25 2018
@@ -608,16 +608,14 @@ msvc-export = ../bindings/swig/ruby/libs
 [javahl-java]
 type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/types
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/util
-src-root = subversion/bindings/javahl/src
 sources = *.java
+native = CommitItemStateFlags.java NativeResources.java SVNClient.java
+ SVNRepos.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
-package-roots = org
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl
 
 [javahl-compat-java]
 type = java
@@ -626,10 +624,12 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
 classes = subversion/bindings/javahl/classes
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+   $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+   $(javahl_java_DEPS)
 ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
 #jar = svn-javahl.jar
-package-roots = org
+package = org.tigris.subversion.javahl
 
 [javahl-tests]
 type = java
@@ -638,10 +638,12 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
-package-roots = org
+package = org.apache.subversion.javahl
 ### Java targets don't do up-to-date checks yet.
 #add-deps = javahl-java
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+   $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+   $(javahl_java_DEPS)
 
 [javahl-compat-tests]
 type = java
@@ -650,65 +652,59 @@ sources = *.java
 install = javahl-java

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/

2018-09-17 Thread jamessan

Author: jamessan
Date: Tue Sep 18 01:50:50 2018
New Revision: 1841179

URL: http://svn.apache.org/viewvc?rev=1841179=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 r1841178, 
subversion/trunk/tools/dist/changes-to-html.py
Modified:
subversion/branches/java10-compat/   (props changed)
subversion/branches/java10-compat/CHANGES

subversion/branches/java10-compat/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/java10-compat/subversion/include/svn_client.h
subversion/branches/java10-compat/subversion/include/svn_version.h
subversion/branches/java10-compat/subversion/include/svn_wc.h
subversion/branches/java10-compat/subversion/libsvn_client/conflicts.c
subversion/branches/java10-compat/subversion/libsvn_client/shelf.c
subversion/branches/java10-compat/subversion/libsvn_wc/wcroot_anchor.c
subversion/branches/java10-compat/subversion/svn/conflict-callbacks.c
subversion/branches/java10-compat/subversion/svn/info-cmd.c
subversion/branches/java10-compat/subversion/svn/svn.c

subversion/branches/java10-compat/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout

subversion/branches/java10-compat/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/branches/java10-compat/subversion/tests/cmdline/shelf_tests.py
subversion/branches/java10-compat/subversion/tests/cmdline/svntest/main.py

subversion/branches/java10-compat/subversion/tests/libsvn_client/conflicts-test.c
subversion/branches/java10-compat/tools/client-side/bash_completion
subversion/branches/java10-compat/tools/dist/release.py

Propchange: subversion/branches/java10-compat/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 18 01:50:50 2018
@@ -99,3 +99,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
+/subversion/trunk:1840224-1841178

Modified: subversion/branches/java10-compat/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/branches/java10-compat/CHANGES?rev=1841179=1841178=1841179=diff
==
--- subversion/branches/java10-compat/CHANGES (original)
+++ subversion/branches/java10-compat/CHANGES Tue Sep 18 01:50:50 2018
@@ -1,10 +1,59 @@
+# To view a revision listed as (rXXX), visit:
+#   https://svn.apache.org/rXXX
+#
+# To view an issue listed as (issue #), visit:
+#   https://issues.apache.org/jira/browse/SVN-
+
+Version 1.12.0
+(?? ??? 20XX, from /branches/1.12.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.12.0
+
 Version 1.11.0
-(?? ??? 20XX, from /branches/1.11.x)
+(17 Oct 2018, from /branches/1.11.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.11.0
 
  User-visible changes:
+  - Major new features:
+* Shelving is no longer based on patch files (experimental) (issue #3625)
+* Checkpointing (experimental) (issue #3626)
+* Viewspec output command (experimental) (r1826864)
+
+  - Minor new features and improvements:
+* Improvements to tree conflict resolution (issue #4694 #4766 ...)
+* 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151)
+* Better error when http:// URL is not a Subversion repository (r1825302)
+* Add 'schedule' and 'depth' items to 'svn info --show-item' (r1827032)
+* Allow the client cert password to be saved (r1836762)
+
+  - Client-side bugfixes:
+* Fix a crash in a repo:WC summary diff of a local copy (r1835218)
+* Fix double diff headers (r1836746)
+* Tree conflict resolver: avoid endless scan in some cases (r1839662)
+
+  - Server-side bugfixes:
+* svnadmin dump shouldn't canonicalize svn:date (issue #4767)
+* 'svnadmin verify --keep-going --quiet' shows an error summary (r1837790)
+* Let 'svnadmin recover' prune the rep-cache even if disabled (r1838813)
+
   - Client-side and server-side bugfixes:
 * Fix pattern-matching of top level path in listing with search (r1830599)
+* Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306)
+
+  - Other tool improvements and bugfixes:
+* tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045)
+
+ Developer-visible changes:
+  - General:
+* new tool: tools/dist/edit-N-log-messages (r1819207)
+* tools/dev/unix-build/Makefile.svn: various fixes
+* Expose the diff option 'pretty_print_mergeinfo' in APIs (r1822014)
+* In 'revert' APIs, choose whether to delete schedule-add nodes (r1822534)
+
+  - Bindings:
+* Fix Python binding fs.FileDiff behaviour with python-future (r1823802)
+* Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410)
+* Bump

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/

2018-09-17 Thread jamessan

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=1841178=1841179=diff
==
--- subversion/branches/java10-compat/subversion/svn/conflict-callbacks.c 
(original)
+++ subversion/branches/java10-compat/subversion/svn/conflict-callbacks.c Tue 
Sep 18 01:50:50 2018
@@ -1534,22 +1534,14 @@ build_tree_conflict_options(
   id != svn_client_conflict_option_accept_current_wc_state)
 *all_options_are_dumb = FALSE;
 
-  if (id == svn_client_conflict_option_incoming_move_file_text_merge ||
-  id == svn_client_conflict_option_incoming_move_dir_merge)
-{
+if (*possible_moved_to_repos_relpaths == NULL)
   SVN_ERR(
-svn_client_conflict_option_get_moved_to_repos_relpath_candidates(
+svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
   possible_moved_to_repos_relpaths, builtin_option,
   result_pool, iterpool));
-  SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates(
-possible_moved_to_abspaths, builtin_option,
-result_pool, iterpool));
-}
-  else if (id == svn_client_conflict_option_local_move_file_text_merge ||
-  id == svn_client_conflict_option_local_move_dir_merge ||
-  id == svn_client_conflict_option_sibling_move_file_text_merge ||
-  id == svn_client_conflict_option_sibling_move_dir_merge)
-  SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates(
+
+if (*possible_moved_to_abspaths == NULL)
+  SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
 possible_moved_to_abspaths, builtin_option,
 result_pool, iterpool));
 }
@@ -1682,6 +1674,69 @@ prompt_move_target_path(int *preferred_m
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+find_conflict_option_with_repos_move_targets(
+  svn_client_conflict_option_t **option_with_move_targets,
+  apr_array_header_t *options,
+  apr_pool_t *scratch_pool)
+{
+  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+  int i;
+  apr_array_header_t *possible_moved_to_repos_relpaths = NULL;
+  
+  *option_with_move_targets = NULL;
+
+  for (i = 0; i < options->nelts; i++)
+{
+  svn_client_conflict_option_t *option;
+
+  svn_pool_clear(iterpool);
+  option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *);
+  
SVN_ERR(svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
+_moved_to_repos_relpaths, option, iterpool, iterpool));
+  if (possible_moved_to_repos_relpaths)
+{
+  *option_with_move_targets = option;
+  break;
+}
+}
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+find_conflict_option_with_working_copy_move_targets(
+  svn_client_conflict_option_t **option_with_move_targets,
+  apr_array_header_t *options,
+  apr_pool_t *scratch_pool)
+{
+  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+  int i;
+  apr_array_header_t *possible_moved_to_abspaths = NULL;
+  
+  *option_with_move_targets = NULL;
+
+  for (i = 0; i < options->nelts; i++)
+{
+  svn_client_conflict_option_t *option;
+
+  svn_pool_clear(iterpool);
+  option = APR_ARRAY_IDX(options, i, svn_client_conflict_option_t *);
+  SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
+  _moved_to_abspaths, option, scratch_pool,
+  iterpool));
+  if (possible_moved_to_abspaths)
+{
+  *option_with_move_targets = option;
+  break;
+}
+}
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
 /* Ask the user what to do about the tree conflict described by CONFLICT
  * and either resolve the conflict accordingly or postpone resolution.
  * SCRATCH_POOL is used for temporary allocations. */
@@ -1809,7 +1864,7 @@ handle_tree_conflict(svn_boolean_t *reso
 {
   int preferred_move_target_idx;
   apr_array_header_t *options;
-  svn_client_conflict_option_t *conflict_option;
+  svn_client_conflict_option_t *option;
 
   SVN_ERR(prompt_move_target_path(_move_target_idx,
   possible_moved_to_repos_relpaths,
@@ -1822,22 +1877,12 @@ handle_tree_conflict(svn_boolean_t *reso
   ctx,
   iterpool,
   iterpool));
-  conflict_option =
-svn_client_conflict_option_find_by_id( 
-  options,
-  svn_client_conflict_option_incoming_move_file_text_merge);
-  if

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

2018-09-17 Thread jamessan

Author: jamessan
Date: Mon Sep 17 16:51:17 2018
New Revision: 1841093

URL: http://svn.apache.org/viewvc?rev=1841093=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 clear that relevant whitespace exists between
   arguments.

Modified:
subversion/branches/java10-compat/build/generator/gen_win.py

Modified: subversion/branches/java10-compat/build/generator/gen_win.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/java10-compat/build/generator/gen_win.py?rev=1841093=1841092=1841093=diff
==
--- subversion/branches/java10-compat/build/generator/gen_win.py (original)
+++ subversion/branches/java10-compat/build/generator/gen_win.py Mon Sep 17 
16:51:17 2018
@@ -358,14 +358,13 @@ class WinGeneratorBase(gen_win_dependenc
 per_project_flags += "-Xlint:-deprecation -Xlint:-dep-ann" \
  " -Xlint:-rawtypes"
 
-  cbuild = ("%s -g -Xlint -Xlint:-options " +
-per_project_flags +
-headers + 
+  cbuild = ("%s -g -Xlint -Xlint:-options %s %s "
 " -target 1.8 -source 1.8 -classpath "
 " %s -d %s "
 " -sourcepath %s $(InputPath)") \
-   % tuple(map(self.quote, (javac_exe, classes,
-targetdir, sourcepath)))
+   % (self.quote(javac_exe), per_project_flags, headers,
+  self.quote(classes), self.quote(targetdir),
+  self.quote(sourcepath))
 
 
   if isinstance(object, gen_base.HeaderFile):

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

2018-09-17 Thread jamessan

Author: jamessan
Date: Mon Sep 17 16:07:56 2018
New Revision: 1841083

URL: http://svn.apache.org/viewvc?rev=1841083=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/branches/java10-compat/build/generator/gen_win.py

Modified: subversion/branches/java10-compat/build/generator/gen_win.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/java10-compat/build/generator/gen_win.py?rev=1841083=1841082=1841083=diff
==
--- subversion/branches/java10-compat/build/generator/gen_win.py (original)
+++ subversion/branches/java10-compat/build/generator/gen_win.py Mon Sep 17 
16:07:56 2018
@@ -347,8 +347,8 @@ class WinGeneratorBase(gen_win_dependenc
   if self.junit_path is not None:
 classes = "%s;%s" % (classes, self.junit_path)
   headers = ''
-  if self.headers is not None:
-headers = '-h %s' % self.quote(self.path(self.headers))
+  if target.headers is not None:
+headers = '-h %s' % self.quote(self.path(target.headers))
 
   sourcepath = self.path(source.sourcepath)

svn commit: r1840977 - in /subversion/branches/java10-compat: Makefile.in build.conf build/generator/gen_base.py build/generator/gen_make.py build/generator/gen_win.py build/generator/templates/build-

2018-09-15 Thread jamessan

Author: jamessan
Date: Sat Sep 15 20:44:06 2018
New Revision: 1840977

URL: http://svn.apache.org/viewvc?rev=1840977=rev
Log:
On the 'java10-compat' branch: Add initial support for building with Java 10

Java 10 removed the javah tool, moving the functionality of generating header
files for native code into javac behind the -h switch.  One command
invocation will both compile the class files and generate the native headers.

To support this, build.conf's java and javah types have been combined into a
single java type.  If there are java files with native code, they need to be
explicitly declared in the new "native" attribute to allow defining a
dependency between the generated header file and the java file.

Unlike javah, javac will only produce header files for source files that
actually have native content, so there is not a 1:1 relationship between .java
and .h files.  This also means that the .java files which don't directly have
native code, but which provide fields used by native code need to be properly
annotated.

* build.conf
  (javahl-javah, javahl-callback-javah, javahl-remote-javah, 
javahl-types-javah):
   Remove in favor of...
  (javahl-java, javahl-callback-java, javahl-remote-java, javahl-types-java):
   Add native attribute declaring files with native content, and headers
   attribute for location of generated header files.
  (javahl-compat-java): List all dependencies now that the javahl-java target
   doesn't aggregate all of its sub-packages.
  (libsvnjavahl): Rename *_javah_DEPS to *_java_DEPS

* build/generator/gen_base.py
  (TargetJavaHeaders, TargetJavaClasses): Remove and merge their functionality
   together into a single TargetJava class.
  (TargetJava): Remove support for package-roots attribute.  Add handling for
   native attribute.  If native content exists for a target, an additional
   DT_LINK object is added to the graph for the header file.

* build/generator/gen_make.py
  (write): Propagate the headers_dir attribute from target_ob into ezt_target.

* build/generator/gen_win.py
  (get_install_targets): Remove check for TargetJavaHeaders type
  (get_proj_sources): Remove checks for/uses of javah executable.  Replace
   TargetJavaClasses/TargetJavaHeaders checks with one for TargetJava.  Add
   "-h headers_dir" to javac command if target has headers location defined.
   Set ctarget/cdesc for the project item based on the object type being
   created.
  (get_output_dir): Use the classes directory for all TargetJava targets,
   since class files will always be created.

* build/generator/templates/build-outputs.mk.ezt
  (target.type "java"): Merge the target's _HEADERS and _OBJECTS rules into
   one, which only depends on the _SRC files.  The link_cmd will include
   "-h headers_dir" if the target has a headers_dir attribute.

* Makefile.in
  (): Remove COMPILE_JAVAHL_JAVAH and JAVAH

Modified:
subversion/branches/java10-compat/Makefile.in
subversion/branches/java10-compat/build.conf
subversion/branches/java10-compat/build/generator/gen_base.py
subversion/branches/java10-compat/build/generator/gen_make.py
subversion/branches/java10-compat/build/generator/gen_win.py

subversion/branches/java10-compat/build/generator/templates/build-outputs.mk.ezt

Modified: subversion/branches/java10-compat/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/branches/java10-compat/Makefile.in?rev=1840977=1840976=1840977=diff
==
--- subversion/branches/java10-compat/Makefile.in (original)
+++ subversion/branches/java10-compat/Makefile.in Sat Sep 15 20:44:06 2018
@@ -218,7 +218,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS)
 # special compilation for files destined for javahl (i.e. C++)
 COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) 
$(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
-COMPILE_JAVAHL_JAVAH = $(JAVAH)
 COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
 
 # On Mac OS X, export an env variable so that the tests can run without
@@ -393,7 +392,6 @@ JAVAC = @JAVAC@
 JAVADOC = @JAVADOC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
-JAVAH = @JAVAH@
 JAR = @JAR@
 
 JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
@@ -494,8 +492,8 @@ revision-install:
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah 
javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib 
@JAVAHL_TESTS_TARGET@ javahl-compat
-install-javahl: javahl install-javahl-java install-javahl-javah 
install-javahl-lib
+javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java 
javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ 
javahl-compat
+install-javahl: javahl install-javahl-java install-javahl-lib
 javahl-compat: javahl

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

2018-09-11 Thread jamessan

Author: jamessan
Date: Wed Sep 12 01:02:35 2018
New Revision: 1840620

URL: http://svn.apache.org/viewvc?rev=1840620=rev
Log:
Create the 'java10-compat' branch

Added:
subversion/branches/java10-compat/   (props changed)
  - copied from r1840223, subversion/trunk/

Propchange: subversion/branches/java10-compat/
--
--- svn:auto-props (added)
+++ svn:auto-props Wed Sep 12 01:02:35 2018
@@ -0,0 +1,13 @@
+*.c = svn:eol-style=native
+*.cpp = svn:eol-style=native
+*.h = svn:eol-style=native
+*.hpp = svn:eol-style=native
+*.java = svn:eol-style=native
+*.py = svn:eol-style=native
+*.pl = svn:eol-style=native
+*.rb = svn:eol-style=native
+*.sql = svn:eol-style=native
+*.txt = svn:eol-style=native
+README = svn:eol-style=native
+BRANCH-README = svn:eol-style=native
+STATUS = svn:eol-style=native

Propchange: subversion/branches/java10-compat/
--
--- svn:ignore (added)
+++ svn:ignore Wed Sep 12 01:02:35 2018
@@ -0,0 +1,54 @@
+ChangeLog*
+Makefile
+config.cache
+config.log
+config.nice
+config.status
+configure
+libtool
+.gdb_history
+.swig_checked
+*.orig
+*.rej
+TAGS
+tags
+neon
+build-outputs.mk
+autogen-standalone.mk
+autom4te.cache
+gen-make.opts
+tests.log*
+fails.log*
+db4-win32
+db
+*.o
+*~
+.*~
+apr
+apr-util
+apr-iconv
+Release
+Debug
+ipch
+subversion_msvc.dsw
+subversion_msvc.ncb
+subversion_msvc.opt
+subversion_msvc.plg
+subversion_vcnet.*
+mkmf.log
+.project
+.classpath
+.cdtproject
+.settings
+.cproject
+zlib
+sqlite-amalgamation
+serf
+googlemock
+.git
+.gitignore
+.idea
+compile_commands.json
+.kdev4
+*.kdev4
+.vs

Propchange: subversion/branches/java10-compat/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Sep 12 01:02:35 2018
@@ -0,0 +1,101 @@
+/subversion/branches/1.10-cache-improvements:1669168-1694487
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x-fs-verify:1146708,1161180
+/subversion/branches/1.9-cache-improvements:1678948-1679863
+/subversion/branches/1.9.x:1735680
+/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop:965046-1000689
+/subversion/branches/authzperf:1613053-1776831
+/subversion/branches/auto-props-sdc:1384106-1401643
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/cache-server:1458643-1476567
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/diff-optimizations:1031270-1037352
+/subversion/branches/diff-optimizations-bytes:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/dump-load-cross-check:1654853-1657295
+/subversion/branches/ev2-export:1325914,1332738,1413107
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-format7:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements:1499981-1547039
+/subversion/branches/fsfs-lock-many:1571740-1577217
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/fsx:1507845-1509914
+/subversion/branches/fsx-1.10:1658219-1694500
+/subversion/branches/fsx-id:1645603-1649011
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/gpg-agent-password-store:1005036-1150766
+/subversion/branches/gtest_addition:1452117-1502138
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/in-repo-authz:1414342-1424779
+/subversion/branches/inheritable-props:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization:1068724-1068739
+/subversion/branches/integrate-cache-membuffer:998649-998852
+/subversion/branches/integrate-compression-level:1068651

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

2018-07-12 Thread jamessan

Author: jamessan
Date: Thu Jul 12 20:14:03 2018
New Revision: 1835775

URL: http://svn.apache.org/viewvc?rev=1835775=rev
Log:
* STATUS:
  Vote +1 on r1830882, approving.
  Vote +1 on r1833465.
  Vote +1 on the 1.10.x-issue4758 branch.
  Vote +1 on r1835760, approving.

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=1835775=1835774=1835775=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jul 12 20:14:03 2018
@@ -15,14 +15,6 @@ Status of 1.10.1:
 Candidate changes:
 ==
 
- * r1830882
-   Fix libsvn_auth_gnome_keyring.pc when built using libsecret.
-   Justification:
- The generated .pc file references files libgnome-keyring, which
- is not used and may not exist.
-   Votes:
- +1: jorton, stsp
-
  * r1830083, r1833864, r1833866
Fix issue #4739, "Accept incoming deletion" option doing nothing
for a locally deleted file
@@ -54,7 +46,7 @@ Candidate changes:
Justification:
  Return an error when the client gets the protocol wrong.
Votes:
- +1: philip
+ +1: philip, jamessan
 
  * r1834612, r1834835
On the '1.10.x-issue4758' branch: Fix SVN-4758 "Unable to shelve changes
@@ -63,7 +55,21 @@ Candidate changes:
  User-reported breakage of 'svn shelve'.
Branch: ^/subversion/branches/1.10.x-issue4758
Votes:
- +1: julianfoad
+ +1: julianfoad, jamessan
+
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
+ * r1830882
+   Fix libsvn_auth_gnome_keyring.pc when built using libsecret.
+   Justification:
+ The generated .pc file references files libgnome-keyring, which
+ is not used and may not exist.
+   Votes:
+ +1: jorton, stsp, jamessan
 
  * r1835760
Fix segfault in the gnome keyring password provider (libsecret version).
@@ -71,10 +77,5 @@ Candidate changes:
  Private API violation; fixes user-reported segfault due to uninitialized
  stack variable.
Votes:
- +1: danielsh, philip
-
-Veto-blocked changes:
-=
+ +1: danielsh, philip, jamessan
 
-Approved changes:
-=

svn commit: r1835201 - /subversion/trunk/build/generator/gen_base.py

2018-07-05 Thread jamessan

Author: jamessan
Date: Fri Jul  6 01:08:29 2018
New Revision: 1835201

URL: http://svn.apache.org/viewvc?rev=1835201=rev
Log:
* build/generator/gen_base.py
  (TargetJavaClasses.add_dependencies): Reverse check for valid filename to
   fail early and avoid an extra level of indentation.  No functional change.

Modified:
subversion/trunk/build/generator/gen_base.py

Modified: subversion/trunk/build/generator/gen_base.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=1835201=1835200=1835201=diff
==
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Fri Jul  6 01:08:29 2018
@@ -972,24 +972,24 @@ class TargetJavaClasses(TargetJava):
   sources.extend(_collect_paths(self.sources, p))
 
 for src, reldir in sources:
-  if src[-5:] == '.java':
-objname = src[:-5] + self.objext
+  if src[-5:] != '.java':
+raise GenError('ERROR: unknown file extension on "' + src + '"')
+
+  objname = src[:-5] + self.objext
 
-# As .class files are likely not generated into the same
-# directory as the source files, the object path may need
-# adjustment.  To this effect, take "target_ob.classes" into
-# account.
-dirs = build_path_split(objname)
-sourcedirs = dirs[:-1]  # Last element is the .class file name.
-while sourcedirs:
-  if sourcedirs.pop() in self.packages:
-sourcepath = build_path_join(*sourcedirs)
-objname = build_path_join(self.classes, *dirs[len(sourcedirs):])
-break
-else:
-  raise GenError('Unable to find Java package root in path "%s"' % 
objname)
+  # As .class files are likely not generated into the same
+  # directory as the source files, the object path may need
+  # adjustment.  To this effect, take "target_ob.classes" into
+  # account.
+  dirs = build_path_split(objname)
+  sourcedirs = dirs[:-1]  # Last element is the .class file name.
+  while sourcedirs:
+if sourcedirs.pop() in self.packages:
+  sourcepath = build_path_join(*sourcedirs)
+  objname = build_path_join(self.classes, *dirs[len(sourcedirs):])
+  break
   else:
-raise GenError('ERROR: unknown file extension on "' + src + '"')
+raise GenError('Unable to find Java package root in path "%s"' % 
objname)
 
   ofile = ObjectFile(objname, self.compile_cmd, self.when)
   sfile = SourceFile(src, reldir)

svn commit: r1834812 - /subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c

2018-07-01 Thread jamessan

Author: jamessan
Date: Mon Jul  2 02:37:52 2018
New Revision: 1834812

URL: http://svn.apache.org/viewvc?rev=1834812=rev
Log:
* subversion/libsvn_wc/wc_deb_wcroot.c
  (svn_wc__db_wcroot_parse_local_abspath) Use an iterpool while trying to find
   the abspath of the wcroot

Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1834812=1834811=1834812=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Mon Jul  2 02:37:52 
2018
@@ -528,6 +528,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
   const char *adm_relpath;
   /* Non-NULL if WCROOT is found through a symlink: */
   const char *symlink_wcroot_abspath = NULL;
+  apr_pool_t *iterpool;
 
   /* ### we need more logic for finding the database (if it is located
  ### outside of the wcroot) and then managing all of that within DB.
@@ -613,16 +614,20 @@ svn_wc__db_wcroot_parse_local_abspath(sv
  database in the right place. If we find it... great! If not, then
  peel off some components, and try again. */
 
+  iterpool = svn_pool_create(scratch_pool);
   adm_relpath = svn_wc_get_adm_dir(scratch_pool);
   while (TRUE)
 {
   svn_error_t *err;
   svn_node_kind_t adm_subdir_kind;
 
-  const char *adm_subdir = svn_dirent_join(local_abspath, adm_relpath,
-   scratch_pool);
+  const char *adm_subdir;
 
-  SVN_ERR(svn_io_check_path(adm_subdir, _subdir_kind, scratch_pool));
+  svn_pool_clear(iterpool);
+
+  adm_subdir = svn_dirent_join(local_abspath, adm_relpath, iterpool);
+
+  SVN_ERR(svn_io_check_path(adm_subdir, _subdir_kind, iterpool));
 
   if (adm_subdir_kind == svn_node_dir)
 {
@@ -697,7 +702,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
 
   SVN_ERR(svn_io_check_resolved_path(local_abspath,
  _kind,
- scratch_pool));
+ iterpool));
   if (resolved_kind == svn_node_dir)
 {
   /* Is this directory recorded in our hash?  */

svn commit: r1834810 - in /subversion/trunk/subversion: svn/shelf-cmd.c tests/cmdline/shelf_tests.py

2018-07-01 Thread jamessan

Author: jamessan
Date: Mon Jul  2 02:27:29 2018
New Revision: 1834810

URL: http://svn.apache.org/viewvc?rev=1834810=rev
Log:
Fix use of implicit path when calling shelf-{list,log,drop} from a wc-subdir

* subversion/svn/shelf-cmd.c:
  (svn_cl__shelf_list, svn_cl__shelf_drop, svn_cl__shelf_log): Convert targets
   to absolute paths

* subversion/tests/cmdline/shelf_tests.py:
  (shelve_unshelve_verify): Add an assertion for "svn shelves"

Modified:
subversion/trunk/subversion/svn/shelf-cmd.c
subversion/trunk/subversion/tests/cmdline/shelf_tests.py

Modified: subversion/trunk/subversion/svn/shelf-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/shelf-cmd.c?rev=1834810=1834809=1834810=diff
==
--- subversion/trunk/subversion/svn/shelf-cmd.c (original)
+++ subversion/trunk/subversion/svn/shelf-cmd.c Mon Jul  2 02:27:29 2018
@@ -935,10 +935,14 @@ svn_cl__shelf_list(apr_getopt_t *os,
 
   for (i = 0; i < targets->nelts; ++i)
 {
+  const char *local_abspath;
   const char *target = APR_ARRAY_IDX(targets, i, const char *);
 
   svn_pool_clear(iterpool);
-  SVN_ERR(shelves_list(target,
+
+  SVN_ERR(svn_dirent_get_absolute(_abspath, target, iterpool));
+
+  SVN_ERR(shelves_list(local_abspath,
opt_state->quiet,
ctx, iterpool));
 }
@@ -1105,10 +1109,13 @@ svn_cl__shelf_drop(apr_getopt_t *os,
 
   for (i = 0; i < targets->nelts; ++i)
 {
+  const char *local_abspath;
   const char *target = APR_ARRAY_IDX(targets, i, const char *);
 
   svn_pool_clear(iterpool);
-  SVN_ERR(shelf_drop(name, target,
+
+  SVN_ERR(svn_dirent_get_absolute(_abspath, target, iterpool));
+  SVN_ERR(shelf_drop(name, local_abspath,
  opt_state->dry_run, opt_state->quiet,
  ctx, iterpool));
 }
@@ -1140,11 +1147,13 @@ svn_cl__shelf_log(apr_getopt_t *os,
 
   for (i = 0; i < targets->nelts; ++i)
 {
+  const char *local_abspath;
   const char *target = APR_ARRAY_IDX(targets, i, const char *);
 
   svn_pool_clear(iterpool);
-  SVN_ERR(shelf_log(name, target,
-ctx, pool));
+
+  SVN_ERR(svn_dirent_get_absolute(_abspath, target, iterpool));
+  SVN_ERR(shelf_log(name, local_abspath, ctx, iterpool));
 }
 
   svn_pool_destroy(iterpool);

Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1834810=1834809=1834810=diff
==
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Mon Jul  2 
02:27:29 2018
@@ -115,6 +115,13 @@ def shelve_unshelve_verify(sbox, modifie
  'shelve', 'foo')
   check_wc_state(wc_dir, virginal_state)
 
+  # List; ensure the shelf is listed
+  expected_output = svntest.verify.RegexListOutput(
+['foo\s*version \d+.*',
+ ' '
+])
+  svntest.actions.run_and_verify_svn(expected_output, [], 'shelves')
+
   # Unshelve; check the original modifications are here again
   svntest.actions.run_and_verify_svn(None, [],
  'unshelve', 'foo')

svn commit: r1831895 - in /subversion/trunk: build/ac-macros/java.m4 build/generator/gen_win.py configure.ac subversion/bindings/javahl/README

2018-05-19 Thread jamessan

Author: jamessan
Date: Sat May 19 14:48:35 2018
New Revision: 1831895

URL: http://svn.apache.org/viewvc?rev=1831895=rev
Log:
Bump minimum JDK version required for JavaHL to 1.8, in preparation for the
changes needed to support Java 10

* subversion/bindings/javahl/README
  (): Update JDK version requirements.

* configure.ac
  (JAVA_OLDEST_WORKING_VER): Set to 1.8

* build/ac-macros/java.m4
  (SVN_FIND_JDK): Set Java source version to 1.8.

* build/generator/gen_win.py
  (get_proj_sources): Set Java source and target version to 1.8.

Modified:
subversion/trunk/build/ac-macros/java.m4
subversion/trunk/build/generator/gen_win.py
subversion/trunk/configure.ac
subversion/trunk/subversion/bindings/javahl/README

Modified: subversion/trunk/build/ac-macros/java.m4
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/java.m4?rev=1831895=1831894=1831895=diff
==
--- subversion/trunk/build/ac-macros/java.m4 (original)
+++ subversion/trunk/build/ac-macros/java.m4 Sat May 19 14:48:35 2018
@@ -166,7 +166,7 @@ AC_DEFUN(SVN_FIND_JDK,
 # The release for "-source" could actually be greater than that
 # of "-target", if we want to cross-compile for lesser JVMs.
 if test -z "$JAVAC_FLAGS"; then
-  JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.6"
+  JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.8"
   if test "$enable_debugging" = "yes"; then
 JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path 
$JAVAC_FLAGS"
 if test -z "$JAVAC_COMPAT_FLAGS"; then

Modified: subversion/trunk/build/generator/gen_win.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1831895=1831894=1831895=diff
==
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Sat May 19 14:48:35 2018
@@ -375,7 +375,7 @@ class WinGeneratorBase(gen_win_dependenc
 
   cbuild = ("%s -g -Xlint -Xlint:-options " +
 per_project_flags +
-" -target 1.5 -source 1.5 -classpath "
+" -target 1.8 -source 1.8 -classpath "
 " %s -d %s "
 " -sourcepath %s $(InputPath)") \
% tuple(map(self.quote, (javac_exe, classes,

Modified: subversion/trunk/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1831895=1831894=1831895=diff
==
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sat May 19 14:48:35 2018
@@ -1306,7 +1306,7 @@ fi
 AC_PATH_PROGS(PYTHON, "$PYTHON", none)
 
 # The minimum version for the JVM runtime for our Java bytecode.
-JAVA_OLDEST_WORKING_VER='1.6'
+JAVA_OLDEST_WORKING_VER='1.8'
 # SVN_CHECK_JDK sets $JAVA_CLASSPATH
 SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
 

Modified: subversion/trunk/subversion/bindings/javahl/README
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/README?rev=1831895=1831894=1831895=diff
==
--- subversion/trunk/subversion/bindings/javahl/README (original)
+++ subversion/trunk/subversion/bindings/javahl/README Sat May 19 14:48:35 2018
@@ -5,7 +5,7 @@ JavaHL provides a (mostly native, using
 a high level Java API for Subversion, which was originally targeted for
 implementors of GUI clients and IDE plug-ins for Subversion.  JavaHL
 currently provides a minimal-but-complete set of APIs which expose the
-core Subversion C API to Java.  It requires a JRE 1.6+ (runtime).
+core Subversion C API to Java.  It requires a JRE 1.8+ (runtime).
 
 It is currently quite mature, and can be considered for production use.
 
@@ -14,7 +14,7 @@ Build system
 
 
 JavaHL should compile and run under Linux, Win32, and Mac OS X with
-JDK 1.6+ and a C++ compiler with a complete implementation of
+JDK 1.8+ and a C++ compiler with a complete implementation of
 C++98 (for example, GCC 3.2 and older cannot compile JavaHL 1.9+).
 
 Its build will produce both a native library (libsvnjavahl-1.so on Unix

svn propchange: r1831856 - svn:log

2018-05-18 Thread jamessan

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

Modified: svn:log at Fri May 18 12:25:46 2018
--
--- svn:log (original)
+++ svn:log Fri May 18 12:25:46 2018
@@ -14,3 +14,5 @@ content.
 
 * types/Revision.java:
   (SVN_INVALID_REVNUM): Add @Native annotation
+
+Patch by: Emmanuel Bourg <ebourg_{AT}_apache.org>

svn commit: r1831856 - in /subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl: CommitItemStateFlags.java callback/UserPasswordCallback.java types/Revision.java

2018-05-18 Thread jamessan

Author: jamessan
Date: Fri May 18 12:11:14 2018
New Revision: 1831856

URL: http://svn.apache.org/viewvc?rev=1831856=rev
Log:
Add @Native annotations to ensure header files are generated when using "javac 
-h".

Unlike javah, which generates header files corresponding to all of the classes
it's pointed at, "javac -h" only generates a header file if there is native
content.

[in subversion/bindings/src/org/apache/subversion/javahl]

* CommitItemStateFlags.java:
  (): Add @Native annotation to all flags

* callback/UserPasswordCallback.java:
  (Reject, AcceptTemporary, AcceptPermanently): Add @Native annotation

* types/Revision.java:
  (SVN_INVALID_REVNUM): Add @Native annotation

Modified:

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java

subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java?rev=1831856=1831855=1831856=diff
==
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
 Fri May 18 12:11:14 2018
@@ -23,6 +23,8 @@
 
 package org.apache.subversion.javahl;
 
+import java.lang.annotation.*;
+
 /**
  * The constants in this interface describe the changes to an item to
  * be committed.
@@ -32,36 +34,43 @@ public interface CommitItemStateFlags
 /**
  * the item has been added
  */
+@Native
 public static final int Add=1;
 
 /**
  * the item has been deleted
  */
+@Native
 public static final int Delete=2;
 
 /**
  * the item has text modifications
  */
+@Native
 public static final int TextMods=4;
 
 /**
  * the item has property modifications
  */
+@Native
 public static final int PropMods=8;
 
 /**
  * the item has been copied
  */
+@Native
 public static final int IsCopy=16;
 
 /**
  * the item has a lock token
  */
+@Native
 public static final int LockToken = 32;
 
 /**
  * the item was moved to this location
  * @since 1.8
  */
+@Native
 public static int MovedHere = 64;
 }

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java?rev=1831856=1831855=1831856=diff
==
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
 Fri May 18 12:11:14 2018
@@ -23,6 +23,8 @@
 
 package org.apache.subversion.javahl.callback;
 
+import java.lang.annotation.*;
+
 /**
  * The interface for requesting authentication credentials from the
  * user.  Should the javahl bindings need the matching information,
@@ -40,16 +42,19 @@ public interface UserPasswordCallback
 /**
  * Reject the connection to the server.
  */
+@Native
 public static final int Reject = 0;
 
 /**
  * Accept the connection to the server once.
  */
+@Native
 public static final int AcceptTemporary = 1;
 
 /**
  * Accept the connection to the server forever.
  */
+@Native
 public static final int AcceptPermanently = 2;
 
 /**

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java?rev=1831856=1831855=1831856=diff
==
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
 Fri May 18 12:11:14 2018
@@ -23,6 +23,7 @@
 
 package org.apache.subversion.javahl.types;
 
+import java.lang.annotation.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -179,6 +180,7 @@ public class Revision implements java.io
 /**
  * Marker revision number for no real revision
  */
+@Native
 pub

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

2018-04-16 Thread 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 propchange: r1751167 - svn:log

2018-04-16 Thread 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: r1827831 - /subversion/trunk/tools/dist/backport.pl

2018-03-27 Thread jamessan

Author: jamessan
Date: Tue Mar 27 12:42:33 2018
New Revision: 1827831

URL: http://svn.apache.org/viewvc?rev=1827831=rev
Log:
* tools/dist/backport.pl: Continue chasing the experimental nature of 'given'
and 'when', through perl5261delta.

Modified:
subversion/trunk/tools/dist/backport.pl

Modified: subversion/trunk/tools/dist/backport.pl
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1827831=1827830=1827831=diff
==
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Tue Mar 27 12:42:33 2018
@@ -9,11 +9,11 @@ use v5.10.0; # needed for $^V
 # experimental and "subject to change" in v5.18 (see perl5180delta).  Every
 # use of it now triggers a warning.
 #
-# As of Perl v5.24.1, the semantics of given/when provided by Perl are
+# As of Perl v5.26.1, the semantics of given/when provided by Perl are
 # compatible with those expected by the script, so disable the warning for
 # those Perls.  But don't try to disable the the warning category on Perls
 # that don't know that category, since that breaks compilation.
-no if (v5.17.0 le $^V and $^V le v5.24.1),
+no if (v5.17.0 le $^V and $^V le v5.26.1),
warnings => 'experimental::smartmatch';
 
 # Licensed to the Apache Software Foundation (ASF) under one

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

2018-03-06 Thread jamessan

Author: jamessan
Date: Wed Mar  7 04:21:02 2018
New Revision: 1826068

URL: http://svn.apache.org/viewvc?rev=1826068=rev
Log:
* STATUS:
  Vote +1 on r1825306, approving.
  Vote +1 on r1825979.

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=1826068=1826067=1826068=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Mar  7 04:21:02 2018
@@ -15,14 +15,6 @@ Status of 1.10.0:
 Candidate changes:
 ==
 
- * r1825306
-   Silence OSX ranlib warnings about object files with no symbols when
-   linking with an external LZ4 library.
-   Justification:
- The core build should be warning-free.
-   Votes:
- +1: brane, philip
-
  * r1825709, r1825711
Don't offer conflict resolution options for 'local move vs incoming move'.
Justication:
@@ -44,10 +36,19 @@ Candidate changes:
Justification:
  Trivial documentation fix.
Votes:
- +1: danielsh
+ +1: danielsh, jamessan
 
 Veto-blocked changes:
 =
 
 Approved changes:
 =
+
+ * r1825306
+   Silence OSX ranlib warnings about object files with no symbols when
+   linking with an external LZ4 library.
+   Justification:
+ The core build should be warning-free.
+   Votes:
+ +1: brane, philip, jamessan
+

svn propchange: r1825853 - svn:log

2018-03-05 Thread jamessan

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

Modified: svn:log at Mon Mar  5 13:04:24 2018
--
--- svn:log (original)
+++ svn:log Mon Mar  5 13:04:24 2018
@@ -1,4 +1,4 @@
-Tweaks to the 1.0 release notes.
+Tweaks to the 1.10 release notes.
 
 * release-notes/1.10.html:
   (Filesystem format bump):

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

2018-03-03 Thread jamessan

Author: jamessan
Date: Sat Mar  3 21:37:27 2018
New Revision: 1825789

URL: http://svn.apache.org/viewvc?rev=1825789=rev
Log:
* STATUS: Add r1825787, r1825788 to r1825783 group

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=1825789=1825788=1825789=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Mar  3 21:37:27 2018
@@ -38,7 +38,7 @@ Candidate changes:
Votes:
  +1: brane, stsp
 
- * r1825783
+ * r1825783, r1825787, r1825788
Ensure test data is correctly aligned before calling
svn_utf__utf{16,32}_to_utf8
Justification:

svn commit: r1825788 - /subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

2018-03-03 Thread jamessan

Author: jamessan
Date: Sat Mar  3 21:32:52 2018
New Revision: 1825788

URL: http://svn.apache.org/viewvc?rev=1825788=rev
Log:
* subversion/tests/libsvn_subr/utf-test.c:
  (test_utf_conversions): Calculate maxlen before allocating buffers.


Modified:
subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/utf-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/utf-test.c?rev=1825788=1825787=1825788=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/utf-test.c Sat Mar  3 
21:32:52 2018
@@ -810,14 +810,17 @@ test_utf_conversions(apr_pool_t *pool)
   /* To assure proper alignment of the source string, it needs to be copied
  into an array of the appropriate type before calling
  svn_utf__utf{16,32}_to_utf8. */
-  apr_uint16_t *source16 = apr_pcalloc(pool, maxlen * sizeof(*source16));
-  apr_int32_t *source32 = apr_pcalloc(pool, maxlen * sizeof(*source32));
+  apr_uint16_t *source16;
+  apr_int32_t *source32;
 
   for (tc = tests; tc->source; ++tc)
 if (tc->sourcelen > maxlen)
   maxlen = tc->sourcelen;
   maxlen++;
 
+  source16 = apr_pcalloc(pool, maxlen * sizeof(*source16));
+  source32 = apr_pcalloc(pool, maxlen * sizeof(*source32));
+
   for (tc = tests; tc->source; ++tc)
 {
   if (tc->sixteenbit)

svn commit: r1825787 - /subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

2018-03-03 Thread jamessan

Author: jamessan
Date: Sat Mar  3 21:03:09 2018
New Revision: 1825787

URL: http://svn.apache.org/viewvc?rev=1825787=rev
Log:
* subversion/tests/libsvn_subr/utf-test.c:
  (test_utf_conversions): Move maxlen loop after declarations

Modified:
subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/utf-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/utf-test.c?rev=1825787=1825786=1825787=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/utf-test.c Sat Mar  3 
21:03:09 2018
@@ -807,11 +807,6 @@ test_utf_conversions(apr_pool_t *pool)
   const svn_string_t *result;
   apr_size_t maxlen = 0;
 
-  for (tc = tests; tc->source; ++tc)
-if (tc->sourcelen > maxlen)
-  maxlen = tc->sourcelen;
-  maxlen++;
-
   /* To assure proper alignment of the source string, it needs to be copied
  into an array of the appropriate type before calling
  svn_utf__utf{16,32}_to_utf8. */
@@ -819,6 +814,11 @@ test_utf_conversions(apr_pool_t *pool)
   apr_int32_t *source32 = apr_pcalloc(pool, maxlen * sizeof(*source32));
 
   for (tc = tests; tc->source; ++tc)
+if (tc->sourcelen > maxlen)
+  maxlen = tc->sourcelen;
+  maxlen++;
+
+  for (tc = tests; tc->source; ++tc)
 {
   if (tc->sixteenbit)
 {

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

2018-03-03 Thread jamessan

Author: jamessan
Date: Sat Mar  3 20:54:27 2018
New Revision: 1825784

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

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=1825784=1825783=1825784=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Mar  3 20:54:27 2018
@@ -38,6 +38,14 @@ Candidate changes:
Votes:
  +1: brane, stsp
 
+ * r1825783
+   Ensure test data is correctly aligned before calling
+   svn_utf__utf{16,32}_to_utf8
+   Justification:
+ Fixes test failure
+   Votes:
+ +1: jamessan
+
 Veto-blocked changes:
 =

svn commit: r1825783 - /subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

2018-03-03 Thread jamessan

Author: jamessan
Date: Sat Mar  3 20:53:50 2018
New Revision: 1825783

URL: http://svn.apache.org/viewvc?rev=1825783=rev
Log:
Ensure test data is correctly aligned before calling svn_utf__utf{16,32}_to_utf8

On systems with strict alignment requirements (such as alpha), using the char*
tc->source as apr_uint16_t*/apr_int32_t* can cause the tests to fail, as
reported at <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823133#22>.

* subversion/tests/libsvn_subr/utf-test.c:
  (test_utf_conversions): Create apr_uint16_t and apr_int32_t arrays to which
   the source string is copied before calling the conversion function, thus
   assuring proper alignment.  Consolidate the handling of conversions where
   length is calculated and where a certain number of codes are converted.

Found by: Michael Cree <mcree{_AT_}orcon.net.nz>


Modified:
subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/utf-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/utf-test.c?rev=1825783=1825782=1825783=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/utf-test.c Sat Mar  3 
20:53:50 2018
@@ -752,8 +752,10 @@ test_utf_conversions(apr_pool_t *pool)
   {
 svn_boolean_t sixteenbit;
 svn_boolean_t bigendian;
+apr_size_t sourcelen;
 const char *source;
 const char *result;
+svn_boolean_t counted;
   } tests[] = {
 
 #define UTF_32_LE FALSE, FALSE
@@ -762,32 +764,36 @@ test_utf_conversions(apr_pool_t *pool)
 #define UTF_16_BE TRUE, TRUE
 
 /* Normal character conversion */
-{ UTF_32_LE, "t\0\0\0" "e\0\0\0" "s\0\0\0" "t\0\0\0" "\0\0\0\0", "test" },
-{ UTF_32_BE, "\0\0\0t" "\0\0\0e" "\0\0\0s" "\0\0\0t" "\0\0\0\0", "test" },
-{ UTF_16_LE, "t\0" "e\0" "s\0" "t\0" "\0\0", "test" },
-{ UTF_16_BE, "\0t" "\0e" "\0s" "\0t" "\0\0", "test" },
+{ UTF_32_LE, 4, "t\0\0\0" "e\0\0\0" "s\0\0\0" "t\0\0\0" "\0\0\0\0", 
"test", FALSE },
+{ UTF_32_BE, 4, "\0\0\0t" "\0\0\0e" "\0\0\0s" "\0\0\0t" "\0\0\0\0", 
"test", FALSE },
+{ UTF_16_LE, 4, "t\0" "e\0" "s\0" "t\0" "\0\0", "test", FALSE },
+{ UTF_16_BE, 4, "\0t" "\0e" "\0s" "\0t" "\0\0", "test", FALSE },
 
 /* Valid surrogate pairs */
-{ UTF_16_LE, "\x00\xD8" "\x00\xDC" "\0\0", "\xf0\x90\x80\x80" }, /* 
U+01 */
-{ UTF_16_LE, "\x34\xD8" "\x1E\xDD" "\0\0", "\xf0\x9d\x84\x9e" }, /* 
U+01D11E */
-{ UTF_16_LE, "\xFF\xDB" "\xFD\xDF" "\0\0", "\xf4\x8f\xbf\xbd" }, /* 
U+10FFFD */
-
-{ UTF_16_BE, "\xD8\x00" "\xDC\x00" "\0\0", "\xf0\x90\x80\x80" }, /* 
U+01 */
-{ UTF_16_BE, "\xD8\x34" "\xDD\x1E" "\0\0", "\xf0\x9d\x84\x9e" }, /* 
U+01D11E */
-{ UTF_16_BE, "\xDB\xFF" "\xDF\xFD" "\0\0", "\xf4\x8f\xbf\xbd" }, /* 
U+10FFFD */
+{ UTF_16_LE, 2, "\x00\xD8" "\x00\xDC" "\0\0", "\xf0\x90\x80\x80", FALSE }, 
/* U+01 */
+{ UTF_16_LE, 2, "\x34\xD8" "\x1E\xDD" "\0\0", "\xf0\x9d\x84\x9e", FALSE }, 
/* U+01D11E */
+{ UTF_16_LE, 2, "\xFF\xDB" "\xFD\xDF" "\0\0", "\xf4\x8f\xbf\xbd", FALSE }, 
/* U+10FFFD */
+
+{ UTF_16_BE, 2, "\xD8\x00" "\xDC\x00" "\0\0", "\xf0\x90\x80\x80", FALSE }, 
/* U+01 */
+{ UTF_16_BE, 2, "\xD8\x34" "\xDD\x1E" "\0\0", "\xf0\x9d\x84\x9e", FALSE }, 
/* U+01D11E */
+{ UTF_16_BE, 2, "\xDB\xFF" "\xDF\xFD" "\0\0", "\xf4\x8f\xbf\xbd", FALSE }, 
/* U+10FFFD */
 
 /* Swapped, single and trailing surrogate pairs */
-{ UTF_16_LE, "*\0" "\x00\xDC" "\x00\xD8" "*\0\0\0", "*\xed\xb0\x80" 
"\xed\xa0\x80*" },
-{ UTF_16_LE, "*\0" "\x1E\xDD" "*\0\0\0", "*\xed\xb4\x9e*" },
-{ UTF_16_LE, "*\0" "\xFF\xDB" "*\0\0\0", "*\xed\xaf\xbf*" },
-{ UTF_16_LE, "\x1E\xDD" "\0\0", "\xed\xb4\x9e" },
-{ UTF_16_L

1 2 >

1 - 100 of 195 matches

Mail list logo