svn commit: r1920582 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Sep 12 06:23:16 2024 New Revision: 1920582 URL: http://svn.apache.org/viewvc?rev=1920582&view=rev Log: * 1.14.x/STATUS: Vote for r1910464, 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=1920582&r1=1920581&r2=1920582&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Sep 12 06:23:16 2024 @@ -22,16 +22,16 @@ Candidate changes: votes: +1: rhuijben +Veto-blocked changes: += + +Approved changes: += + * r1910464 Fix svnadmin_tests.py (build_repcache) failing with Python 3.11+ on Windows. Justification: Make unit tests to pass with the latest version of Python on Windows. votes: - +1: jun66j5 - -Veto-blocked changes: -= - -Approved changes: -= + +1: jun66j5, jcorvel
svn commit: r66279 - /dev/subversion/subversion-1.14.3.zip.asc
Author: jcorvel Date: Sat Dec 23 00:35:33 2023 New Revision: 66279 Log: Add my signature for 1.14.3 (Windows). Modified: dev/subversion/subversion-1.14.3.zip.asc Modified: dev/subversion/subversion-1.14.3.zip.asc == --- dev/subversion/subversion-1.14.3.zip.asc (original) +++ dev/subversion/subversion-1.14.3.zip.asc Sat Dec 23 00:35:33 2023 @@ -31,3 +31,19 @@ h8/G12elOY/avfI7d/d6JBNsLHg72cqSkuDh2GF9 BIF3T1ZI6tNM/HrUk6kr =VYVw -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEiqLBDuqtRPlpcnrqtZzm1gEMiq0FAmWGGiwACgkQtZzm1gEM +iq1nTBAArXjdcjZwEkAJ+naXAEbpE9jdsFCA6VpRtjcwsWS15hyXk+PpmNFeARs6 ++CUTSZA4JiUp68tMYNOuto9lpK6tMpr+XMKldz/k+mUWUOzRG6ONTriEkB1iH3/x +jocYw74F1OsjeHsUyFSMhridXRDOIDQw8B/Zmh4lMjTar3jCrTkG2RjofwiRPj4f +MAFlyLTLSsdZvhflUkuRWMdg3yBEg+4qukzmnEijZpnXLhGEp6k7rD7jiiIJHFtr +Zq6nG2oOkf+eXZcszy0EIw8297FC4yRJdaDEkWzXlV9hyqEwfBpGeZM3dkv6T13f +RxDQ+ctNN9EgNjEI1RXwBhFLSvodWVT4ulmwh6bNh63NTSI/6xBx0mpBn2Kl21sL +dSlh+qXMBa9Kuguxmipymrmh83N44NjOJmI1tq3iPdNCy+BZxO3GhdTE/oHH6X8l +ppvA5SW5fZAMKFHafgXcTkqqn2xyjxZJ2aiZcfiA9nOjxtfgEYwFnAbYZ2lfbcls +lh9mI3XMa6OSV1hEJSJ6jlvjftVv9XhwdUEPs6JM7gGiAuZ7YT/HFc5QZXJUJ6EW +V3CHGYulctHKwWj/FDzmE9W2OmrCezSPLbMizKARHo5OcosF9VeUq2V6s4W7+5MR +zS6U4LDxFPdE6cMYQUjuR5mnhL3XKoWw5bwAve93710ld3/SoLo= +=0Ogy +-END PGP SIGNATURE-
svn commit: r1899654 - /subversion/branches/pristines-on-demand-on-mwf/win-tests.py
Author: jcorvel
Date: Thu Apr 7 19:18:41 2022
New Revision: 1899654
URL: http://svn.apache.org/viewvc?rev=1899654&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: add '--wc-format-version'
option to win-tests.py, and pass it to run_tests.py.
Modified:
subversion/branches/pristines-on-demand-on-mwf/win-tests.py
Modified: subversion/branches/pristines-on-demand-on-mwf/win-tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/win-tests.py?rev=1899654&r1=1899653&r2=1899654&view=diff
==
--- subversion/branches/pristines-on-demand-on-mwf/win-tests.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/win-tests.py Thu Apr 7
19:18:41 2022
@@ -114,6 +114,7 @@ def _usage_exit():
print(" --fsfs-sharding: Specify shard size (for fsfs)")
print(" --fsfs-packing : Run 'svnadmin pack' automatically")
print(" --fsfs-compression=VAL : Set compression type to VAL (for fsfs)")
+ print(" --wc-format-version=VAL: Set the WC format version")
print(" -q, --quiet: Deprecated; this is the default.")
print(" Use --set-log-level instead.")
@@ -145,7 +146,7 @@ opts, args = my_getopt(sys.argv[1:], 'hr
'log-to-stdout', 'mode-filter=', 'milestone-filter=',
'ssl-cert=', 'exclusive-wc-locks', 'memcached-server=',
'skip-c-tests', 'dump-load-cross-check',
'memcached-dir=',
-'fsfs-compression=',
+'fsfs-compression=', 'wc-format-version=',
])
if len(args) > 1:
print('Warning: non-option arguments after the first one will be ignored')
@@ -193,6 +194,7 @@ skip_c_tests = None
dump_load_cross_check = None
fsfs_compression = None
fsfs_dir_deltification = None
+wc_format_version = None
for opt, val in opts:
if opt in ('-h', '--help'):
@@ -291,6 +293,8 @@ for opt, val in opts:
fsfs_compression = val
elif opt == '--fsfs-dir-deltification':
fsfs_dir_deltification = val
+ elif opt == '--wc-format-version':
+wc_format_version = val
# Calculate the source and test directory names
abs_srcdir = os.path.abspath("")
@@ -1132,6 +1136,7 @@ if not test_javahl and not test_swig:
opts.dump_load_cross_check = dump_load_cross_check
opts.fsfs_compression = fsfs_compression
opts.fsfs_dir_deltification = fsfs_dir_deltification
+ opts.wc_format_version = wc_format_version
th = run_tests.TestHarness(abs_srcdir, abs_builddir,
log_file, fail_log_file, opts)
old_cwd = os.getcwd()
svn commit: r53659 - /dev/subversion/subversion-1.10.8.zip.asc
Author: jcorvel Date: Tue Apr 5 20:31:44 2022 New Revision: 53659 Log: Add my signature for 1.10.8 (Windows) Modified: dev/subversion/subversion-1.10.8.zip.asc Modified: dev/subversion/subversion-1.10.8.zip.asc == --- dev/subversion/subversion-1.10.8.zip.asc (original) +++ dev/subversion/subversion-1.10.8.zip.asc Tue Apr 5 20:31:44 2022 @@ -5,3 +5,19 @@ y5PjAP9AcnI7a7ahdyE/tW5T42ArJ6rSeto5FpOV TUVPjIuBbLS+GjqnElDuoUGDAbQNvQY= =tUct -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEiqLBDuqtRPlpcnrqtZzm1gEMiq0FAmJMpwUACgkQtZzm1gEM +iq0gTxAAoa4wBU3ZEVm0b5BLxQpJN8pctERN2u8ayEqDFM8Zbm+5DAq+LDbAJQ44 +1OJia3yEYpBNGWu8v3qoC7XNQ/f7QXHhMNnUMCm82bwjHufnib1qzUJZYLHSK9gy +iQqTRU81Jo+C8aPrbRjzqEX6j6sckv23+0vHYqZYYBKLZ8BOOwcXEzSfmXrk9shR +m/794W2OweXaJ4bfD1dYUH3viUuRoCTygQYEErmpIC4c8I/CMDXYeCp93mMJoZwf +8+ReJJ1Zsq1ffnGtv+TDcRY0xMFveKdtOrbvFn16Eu3mUgIyD2VQEGjj4e/1alyv +DgRibiHlT6YIwOgSHf+G6RJp3NH78jVf0t3UY8bdrAe5klExbQ8BkW5xs/833bJW +KMCKpfnWakvnn4sYw0P1wbUm+gRukhQ0vklegyOD2kO4RGGlMHXvaSA6qjONvmaa +n7wRJUTK4xEL+wLe0sXQ0ARmZwLNJTbSQjdsjH5v/n40jDzXUCrynI5XEox5nT74 +hSBq2CKjm0OY9jVMol6GgzYzD6kxR9/IHHwMJaNolLw99CJqCKVsYC2dNbSCmP5L +qmwvprB2ofXxG4R1eJ7urebfIOx6B0hmev8aw7KVQpcrm2Wp2WS+FG+jKn0tHMTW +SJkrvo+HS8oS5sX5uc2e6ieGjYIaoobANq4XOBCtE09oNDCAUv8= +=Vigs +-END PGP SIGNATURE-
svn commit: r53657 - /dev/subversion/subversion-1.14.2.zip.asc
Author: jcorvel Date: Tue Apr 5 20:30:41 2022 New Revision: 53657 Log: Add my signature for 1.14.2 (Windows) Modified: dev/subversion/subversion-1.14.2.zip.asc Modified: dev/subversion/subversion-1.14.2.zip.asc == --- dev/subversion/subversion-1.14.2.zip.asc (original) +++ dev/subversion/subversion-1.14.2.zip.asc Tue Apr 5 20:30:41 2022 @@ -5,3 +5,19 @@ y+Z1AQDAhsqCg9Vn+duyD97KbTxZfehd+uCmzoIe IoLGAi7fyl5W7n+dv+KOXFWzJlrojwM= =a86t -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEiqLBDuqtRPlpcnrqtZzm1gEMiq0FAmJMpmQACgkQtZzm1gEM +iq30HA/8CCJwOHHYmx6qzumeTxmiW+ZORSGYRn52j3C2EQOZPfbeKXkNQh052ntx +3JI3GMhlQPhms/QzDyDqfMy6zw6quVhP1BKNR4fjcts3SC+bjUcbplwEUM38BiA8 +RZiaAlO7fwIjgEFLSixKKwL/+RAr+U35Q8yPw2gtszMTIOZVg8MBKWmNC1fv5GJN +64lDGCtnzgPdZTcNsvaVqXCpPl1O8hNmLCPSQyLzom5UsNy6wkW1VEHJqA8dXm4K +tMpuGURW/8NBjKlXOT/gg7TijjXKHk8PqyFcCEUFzpAdL/V2/wzO4W3FT1yD1UiL +y1837e2PUWDydeAnt2atYxjm3BiGiBiJEdfy1MIKm508KNRQy5E+0VOaN4F9B0pe +ZrmPh9t2IzxdB+AWbYS74BFQUHXc93LNjQ4abQl7zWZkcNibkNN32lULNgLqurEG +RKSBgRyycxL6uzyovuhiLGI7WA+uOC1Bu1CD5KYrhrSWtoBFEf8pV42w+Loi6SHm +xCrgbycWZbDzmrFzlsnTpHvgq60aKJodaIAox4pJkd5Xx1vTSkLs8bdGs8xy0j8a +mc7kM1NJ8p+8wpPvjqS7rBKfEy3uPbgNyPrsExcbowNZk0L/QC4XYKvNanQRvsC/ +92AoiwxxsoOD24r4eRCN2x53TfE303X9f9mlQg4JKwwGnlI1PPA= +=v/9k +-END PGP SIGNATURE-
svn commit: r1899459 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Thu Mar 31 21:50:34 2022 New Revision: 1899459 URL: http://svn.apache.org/viewvc?rev=1899459&view=rev Log: * 1.10.x/STATUS: Vote for r1884474, 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=1899459&r1=1899458&r2=1899459&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Mar 31 21:50:34 2022 @@ -15,15 +15,15 @@ Status of 1.10.8: Candidate changes: == - * r1884474 - Fixes authz tests on Windows - Justification: - Should have been part of the r1883838 group that was backported - votes: - +1: jun66j5, markphip - Veto-blocked changes: = Approved changes: = + + * r1884474 + Fixes authz tests on Windows + Justification: + Should have been part of the r1883838 group that was backported + votes: + +1: jun66j5, markphip, jcorvel
svn commit: r1899458 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Mar 31 21:43:30 2022 New Revision: 1899458 URL: http://svn.apache.org/viewvc?rev=1899458&view=rev Log: * 1.14.x/STATUS: Vote for r1884474, 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=1899458&r1=1899457&r2=1899458&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Mar 31 21:43:30 2022 @@ -39,15 +39,15 @@ Candidate changes: votes: +1: rhuijben - * r1884474 - Fixes authz tests on Windows - Justification: - Should have been part of the r1883838 group that was backported - votes: - +1: markphip, jun66j5 - Veto-blocked changes: = Approved changes: = + + * r1884474 + Fixes authz tests on Windows + Justification: + Should have been part of the r1883838 group that was backported + votes: + +1: markphip, jun66j5, jcorvel
svn commit: r45876 - /dev/subversion/subversion-1.10.7.zip.asc
Author: jcorvel Date: Sun Feb 7 20:11:13 2021 New Revision: 45876 Log: Add my signature for 1.10.7 (Windows). Modified: dev/subversion/subversion-1.10.7.zip.asc Modified: dev/subversion/subversion-1.10.7.zip.asc == --- dev/subversion/subversion-1.10.7.zip.asc (original) +++ dev/subversion/subversion-1.10.7.zip.asc Sun Feb 7 20:11:13 2021 @@ -8,3 +8,19 @@ Z1ESCxl3fodcNGr3nc133LMGgIJktGX+Gnkwd9GJ nz/a+SNH89IkKcxeNEG1pbHfWankDvPVYlz1yUKYQHT0jY5iS9Ow+T06ZGXdYQk= =5w1U -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJgIDMeAAoJELWc5tYBDIqtXWAP/0fYa6wGyVbvcpcnPXKM760D +aEBjTqs3/YbFN3ZeRaOJ4ewDQ7zWYXH0FGCoxuZEBSIkfXUT4FAnyKJrtfhuY9pD +SZkXzssB7rsgrWmSBBiZ8CldMFsXdRmH/CwnV/ii9fykGNOa9C1DqgsfAxCJeIMu +8yzVzEZvRnbpBzEL/HirJJ7JmdffW6/Wb8vq+8+NVjlInEZuy+JDOUOQ4CW6v7sG +gE+mVPhWWIxYHgqRrluNYq9LXS/NYZsCczUsq/lWZXbz+9zVXJO5ozgPxAJY+ZIz +zr8QE3HryJaK/pBbwJVRXmO31m0vGLpelj635h9kl5ZUo8SCW2PTcj0gQca8zuXa +MmE1Ropn/HrOKE927jwXAlZJQ89xKNLR7JR/x3EXbTjmeclqqjp7638XBLEe7J9s +NKS/n419rRSmLAQfBYPa3cSvecpRglVkDdFWLogFeYpxdwsEqLFJEWAjZeysF55z +IPyOxvT8/y+gAl1w5ai6emX0YW63ngnUUr7ZnOHVXhaKiLb3tLoafOePRPGoBED4 +0YBRTmONboBeXayQ//O+QMsiQmhZpsE6G9+nr/GmYRR4G+A7az6FwGtKoBd80zSc +j3vBQbbXWPsWI07eqVIrD6ARv36YjoTkR5Cuqh09+yi/Gj2soanHH2zXIvt1E64i ++2eAxVY76YZiwJTYUlL9 +=6LYN +-END PGP SIGNATURE-
svn commit: r45875 - /dev/subversion/subversion-1.14.1.zip.asc
Author: jcorvel Date: Sun Feb 7 17:27:06 2021 New Revision: 45875 Log: Add my signature for 1.14.1 (Windows). Modified: dev/subversion/subversion-1.14.1.zip.asc Modified: dev/subversion/subversion-1.14.1.zip.asc == --- dev/subversion/subversion-1.14.1.zip.asc (original) +++ dev/subversion/subversion-1.14.1.zip.asc Sun Feb 7 17:27:06 2021 @@ -8,3 +8,19 @@ m+XjA0YrdpLtGuTjZwqaKMa+Ck/RtMVVVMYXnzkN M8DFmtDC5kY5DCnJ+Z6YC7aKfvYMwRk+E8oz6F6zPGg/VeTlojOt77ixfn1C1YE= =cAoR -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJgICJ8AAoJELWc5tYBDIqtgqkP/2xOi+s+iose90xD4wtdJgVq +xwJ3gcCxws1HHdcMNtUudP740gI7J4BFNEDExuQLNQ8RjhysvXTKEO7nhwo4GyX9 +HgKwafyyrRy6dTQ6tBAl0FC40GeACa2CSXMJfmn2I0UBKUe7RgG4l806FoI/Amw0 +i/IQjwcqLYdNhBfkv70XoJxW35W1nVE9KsELVN7KJk1JRXsJRZ0+VyUjE5pBulYH +7FYoNNOgl1O9eJKRjSQXGD+FltYhYSi84uJ4fXntOZGEztqvbATmSw52wrKyZpOX +ewzjltvknbgNXbYcs8Xm/0WVaB0QH43gqZfUZJ4wtZcTrqtf6bgtEXoVk7HIpRZG +Jw/tqcmNIuGXTchZRu2eTNW2O9LdCv68r1NnMFhk6sFvwiyKmtOslCUItiAaYx0b +Yj4MYeG39it9+I6I3eM+9zeJqGiJYR+vhKCDf8G0GiwA2oJktBqcW3xHlx814IiE +/7AtaMz9Uw2rAgaHGJbyxTtskddK6rCpEX4UX3LXk8v4C44UYcNEpBeZvVCp7Ava +VWAaiofdqeaUneDxNQ9Ji4JoojT2hhNvQuXjKxI+JZTqIawCvxiyW837hK/QlZnT +A4zZ1NWMkBTxHIXfcJ4tqH/57LgB3YQXELrMcXAZ8w8oc7iuW2fN2XAEBqKRtGk8 +2Zf01GEAIl1J8WD3UOS/ +=6k// +-END PGP SIGNATURE-
svn commit: r1886034 - /subversion/branches/1.10.x/STATUS
Author: jcorvel
Date: Fri Jan 29 20:12:33 2021
New Revision: 1886034
URL: http://svn.apache.org/viewvc?rev=1886034&view=rev
Log:
* 1.10.x/STATUS: Vote for r1885983, 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=1886034&r1=1886033&r2=1886034&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jan 29 20:12:33 2021
@@ -43,15 +43,6 @@ Candidate changes:
Votes:
+1: stsp, jcorvel
- * r1885983
- Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
- Justification:
- Bugfix; 'svn info --xml' should give correct results; user complained.
- Branch:
- 1.10.x-r1885983
- Votes:
- +1: hartmannathan, stsp
-
Veto-blocked changes:
=
@@ -64,3 +55,12 @@ Approved changes:
Missing return value check. C is hard.
Votes:
+1: stsp, hartmannathan, jcorvel
+
+ * r1885983
+ Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
+ Justification:
+ Bugfix; 'svn info --xml' should give correct results; user complained.
+ Branch:
+ 1.10.x-r1885983
+ Votes:
+ +1: hartmannathan, stsp, jcorvel
svn commit: r1886033 - /subversion/branches/1.14.x/STATUS
Author: jcorvel
Date: Fri Jan 29 20:02:50 2021
New Revision: 1886033
URL: http://svn.apache.org/viewvc?rev=1886033&view=rev
Log:
* 1.14.x/STATUS: Vote for r1885983, 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=1886033&r1=1886032&r2=1886033&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Jan 29 20:02:50 2021
@@ -50,13 +50,6 @@ Candidate changes:
Votes:
+1: hartmannathan, stsp
- * r1885983
- Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
- Justification:
- Bugfix; 'svn info --xml' should give correct results; user complained.
- Votes:
- +1: hartmannathan, stsp
-
* r1886029
Fix several crashes and JNI warnings in javahl TunnelAgent.
Justification:
@@ -104,3 +97,10 @@ Approved changes:
Missing return value check. C is hard.
Votes:
+1: stsp, hartmannathan, jcorvel
+
+ * r1885983
+ Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
+ Justification:
+ Bugfix; 'svn info --xml' should give correct results; user complained.
+ Votes:
+ +1: hartmannathan, stsp, jcorvel
svn commit: r1886031 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 29 19:41:32 2021 New Revision: 1886031 URL: http://svn.apache.org/viewvc?rev=1886031&view=rev Log: * 1.14.x/STATUS: Nominate r1886029 (JavaHL fixes). 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=1886031&r1=1886030&r2=1886031&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 19:41:32 2021 @@ -57,6 +57,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886029 + Fix several crashes and JNI warnings in javahl TunnelAgent. + Justification: + JavaHL shouldn't crash. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1886030 - /subversion/branches/javahl-1.14-fixes/
Author: jcorvel Date: Fri Jan 29 19:27:01 2021 New Revision: 1886030 URL: http://svn.apache.org/viewvc?rev=1886030&view=rev Log: Remove javahl-1.14-fixes branch (merged to trunk in r1886029). Removed: subversion/branches/javahl-1.14-fixes/
svn commit: r1886029 - in /subversion/trunk: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ subversion/bindings/javahl/tests/org/apache/subvers
Author: jcorvel
Date: Fri Jan 29 19:24:36 2021
New Revision: 1886029
URL: http://svn.apache.org/viewvc?rev=1886029&view=rev
Log:
Merge the javahl-1.14-fixes branch to trunk.
Fixes several crashes in javahl TunnelAgent.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/trunk/
--
Merged /subversion/branches/javahl-1.14-fixes:r1882126-1886028
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1886029&r1=1886028&r2=1886029&view=diff
==
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fri Jan 29
19:24:36 2021
@@ -551,6 +551,11 @@ std::string JNIUtil::makeSVNErrorMessage
jstring *jerror_message,
jobject *jmessage_stack)
{
+ // This function may be called with a pending Java exception.
+ // It is incorrect to call Java methods (see code below) with a pending
+ // exception. Stash it away until this function exits.
+ StashException stash(getEnv());
+
if (jerror_message)
*jerror_message = NULL;
if (jmessage_stack)
@@ -761,16 +766,27 @@ namespace {
const char* known_exception_to_cstring(apr_pool_t* pool)
{
JNIEnv *env = JNIUtil::getEnv();
+
+ // This function may be called with a pending Java exception.
+ // It is incorrect to call Java methods (see code below) with a pending
+ // exception. Stash it away until this function exits.
jthrowable t = env->ExceptionOccurred();
+ StashException stashed(env);
+
jclass cls = env->GetObjectClass(t);
jstring jclass_name;
{
jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
jobject clsobj = env->CallObjectMethod(t, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
+
jclass basecls = env->GetObjectClass(clsobj);
mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
}
jstring jmessage;
@@ -778,6 +794,8 @@ const char* known_exception_to_cstring(a
jmethodID mid = env->GetMethodID(cls, "getMessage",
"()Ljava/lang/String;");
jmessage = (jstring) env->CallObjectMethod(t, mid);
+if (JNIUtil::isJavaExceptionThrown())
+ return NULL;
}
JNIStringHolder class_name(jclass_name);
@@ -1169,3 +1187,28 @@ jthrowable JNIUtil::unwrapJavaException(
return
WrappedException::get_exception(err->pool);
}
+
+StashException::StashException(JNIEnv* env)
+{
+ m_env = env;
+ m_stashed = NULL;
+ stashException();
+}
+
+StashException::~StashException()
+{
+ if (m_stashed)
+m_env->Throw(m_stashed);
+}
+
+void StashException::stashException()
+{
+ jthrowable jexc = m_env->ExceptionOccurred();
+ if (!jexc)
+return;
+
+ if (!m_stashed)
+m_stashed = jexc;
+
+ m_env->ExceptionClear();
+}
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1886029&r1=1886028&r2=1886029&view=diff
==
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Fri Jan 29
19:24:36 2021
@@ -330,4 +330,37 @@ class JNIUtil
} \
} while(0)
+/**
+ * If there's an exception pending, temporarily stash it away, then
+ * re-throw again in destructor. The goal is to allow some Java calls
+ * to be made despite a pending exception. For example, doing some
+ * necessary cleanup.
+ */
+class StashException
+{
+ public:
+ /*
+ * Works like stashException().
+ */
+ StashException(JNIEnv* env);
+
+ /**
+ * If there's an exception sta
svn commit: r1886028 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Jan 29 18:51:42 2021 New Revision: 1886028 URL: http://svn.apache.org/viewvc?rev=1886028&view=rev Log: * 1.10.x/STATUS: Vote for r1886019, 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=1886028&r1=1886027&r2=1886028&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 18:51:42 2021 @@ -52,15 +52,15 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1886019 - Fix a potential NULL dereference in the config file parser. - Justification: - Missing return value check. C is hard. - Votes: - +1: stsp, hartmannathan - Veto-blocked changes: = Approved changes: = + + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp, hartmannathan, jcorvel
svn commit: r1886027 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 29 18:45:38 2021 New Revision: 1886027 URL: http://svn.apache.org/viewvc?rev=1886027&view=rev Log: * 1.14.x/STATUS: Vote for r1886019, 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=1886027&r1=1886026&r2=1886027&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 18:45:38 2021 @@ -57,13 +57,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1886019 - Fix a potential NULL dereference in the config file parser. - Justification: - Missing return value check. C is hard. - Votes: - +1: stsp, hartmannathan - Veto-blocked changes: = @@ -97,3 +90,10 @@ Approved changes: r1882234 Votes: +1: jcorvel, futatuki, stsp + + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp, hartmannathan, jcorvel
svn commit: r1885996 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Jan 28 20:10:31 2021 New Revision: 1885996 URL: http://svn.apache.org/viewvc?rev=1885996&view=rev Log: 1.14.x/STATUS: Vote for r1882234. 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=1885996&r1=1885995&r2=1885996&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Jan 28 20:10:31 2021 @@ -72,7 +72,7 @@ Candidate changes: Justification: Editor invocation should work correctly in any valid locale. Votes: - +1: futatuki + +1: futatuki, jcorvel Veto-blocked changes: =
svn commit: r1885972 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Jan 28 11:08:24 2021 New Revision: 1885972 URL: http://svn.apache.org/viewvc?rev=1885972&view=rev Log: 1.14.x/STATUS: Nominate r1885953. 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=1885972&r1=1885971&r2=1885972&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Jan 28 11:08:24 2021 @@ -50,6 +50,14 @@ Candidate changes: Votes: +1: hartmannathan + * r1885953 + Fix file name encoding and quoting when invoking editor on Windows. + Justification: + Invoking editor with special character or spaces in path is broken + on Windows. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1885818 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Jan 22 20:35:10 2021 New Revision: 1885818 URL: http://svn.apache.org/viewvc?rev=1885818&view=rev Log: * 1.10.x/STATUS: Vote for r1835049 group (issue #4762) 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=1885818&r1=1885817&r2=1885818&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 22 20:35:10 2021 @@ -82,7 +82,7 @@ Candidate changes: only if both the user and the path match the repository-specific rule. Branch: ^/subversion/branches/1.10.x-issue4762 Votes: - +1: stsp + +1: stsp, jcorvel Veto-blocked changes: =
svn commit: r1885817 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 22 20:02:13 2021 New Revision: 1885817 URL: http://svn.apache.org/viewvc?rev=1885817&view=rev Log: * 1.14.x/STATUS: Move r1884427 group (mailer.py Py3 fixes) to Approved section, since it already has enough votes according to our guidelines. 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=1885817&r1=1885816&r2=1885817&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 22 20:02:13 2021 @@ -46,13 +46,6 @@ Candidate changes: Votes: +1: futatuki, stsp - * r1884427, r1885557, r1885600, r1885656, r1885784, r1885785 - Make mailer.py work properly with Python 3. - Justification: - Hook scripts should support Python 3 on 1.14.x. - Votes: - +1: stsp, futatuki - Veto-blocked changes: = @@ -74,3 +67,10 @@ Approved changes: The future is here! Votes: +1: stsp, futatuki, jcorvel + + * r1884427, r1885557, r1885600, r1885656, r1885784, r1885785 + Make mailer.py work properly with Python 3. + Justification: + Hook scripts should support Python 3 on 1.14.x. + Votes: + +1: stsp, futatuki
svn commit: r1885816 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Jan 22 19:56:25 2021 New Revision: 1885816 URL: http://svn.apache.org/viewvc?rev=1885816&view=rev Log: * 1.14.x/STATUS: Vote for r1885795, 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=1885816&r1=1885815&r2=1885816&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 22 19:56:25 2021 @@ -53,13 +53,6 @@ Candidate changes: Votes: +1: stsp, futatuki - * r1885795 - Update copyright year to 2021. - Justification: - The future is here! - Votes: - +1: stsp, futatuki - Veto-blocked changes: = @@ -74,3 +67,10 @@ Veto-blocked changes: Approved changes: = + + * r1885795 + Update copyright year to 2021. + Justification: + The future is here! + Votes: + +1: stsp, futatuki, jcorvel
svn commit: r1885815 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Jan 22 19:55:19 2021 New Revision: 1885815 URL: http://svn.apache.org/viewvc?rev=1885815&view=rev Log: * 1.10.x/STATUS: Upgrade my vote to r1874850 group (copyright year bump) 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=1885815&r1=1885814&r2=1885815&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 22 19:55:19 2021 @@ -44,9 +44,7 @@ Candidate changes: Justification: The future is here! Votes: - +1: stsp - +1: jcorvel (though by the time we get to this, we might need 2021, - in that case, +1 too) + +1: stsp, jcorvel * r1875602 Remove incorrect include paths from svn_cv_ruby_includes.
svn commit: r1885493 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Jan 14 17:33:05 2021 New Revision: 1885493 URL: http://svn.apache.org/viewvc?rev=1885493&view=rev Log: * 1.14.x/STATUS: Vote +0 for r1885112, approving (bindings-only or testscript-only changes require just one +1 and one +0 (or concept +1)). 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=1885493&r1=1885492&r2=1885493&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Jan 14 17:33:05 2021 @@ -46,14 +46,6 @@ Candidate changes: Votes: +1: futatuki - * r1885112 - swig-py: Fix a typo in tests. - Justification: - This typo causes DeprecationWarning since Python 3.6 and it will be - Syntax error. - Votes: - +1: futatuki - Veto-blocked changes: = @@ -68,3 +60,12 @@ Veto-blocked changes: Approved changes: = + + * r1885112 + swig-py: Fix a typo in tests. + Justification: + This typo causes DeprecationWarning since Python 3.6 and it will be + Syntax error. + Votes: + +1: futatuki + +0: jcorvel
svn commit: r1884662 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Sun Dec 20 21:26:19 2020 New Revision: 1884662 URL: http://svn.apache.org/viewvc?rev=1884662&view=rev Log: * 1.14.x/STATUS: Vote for r1884642, 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=1884662&r1=1884661&r2=1884662&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sun Dec 20 21:26:19 2020 @@ -46,14 +46,6 @@ Candidate changes: Votes: +1: futatuki - * r1884642 - Fix win-tests.py is unable to load Python bindings with debug configuration - since Python 3.5. - Justification: - Allow unit tests with debug configuration on Windows. - Votes: - +1: jun66j5 - Veto-blocked changes: = @@ -68,3 +60,11 @@ Veto-blocked changes: Approved changes: = + + * r1884642 + Fix win-tests.py is unable to load Python bindings with debug configuration + since Python 3.5. + Justification: + Allow unit tests with debug configuration on Windows. + Votes: + +1: jun66j5, jcorvel
svn commit: r1884585 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Dec 18 00:38:51 2020 New Revision: 1884585 URL: http://svn.apache.org/viewvc?rev=1884585&view=rev Log: * 1.10.x/STATUS: Vote for r1878997 group (issue #4859). Add -1 vote to r1880192 (issue #4862), because the test fails on Windows. Nominate and vote for the test fix (r1881985 group). If the test fix gets enough votes too, my vote for r1880192 can be converted to +1. 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=1884585&r1=1884584&r2=1884585&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Dec 18 00:38:51 2020 @@ -62,7 +62,7 @@ Candidate changes: Annoying failure, encountered in real use. Branch: ^/subversion/branches/1.10.x-issue4859 Votes: - +1: julianfoad + +1: julianfoad, jcorvel * r1880192 Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic". @@ -72,6 +72,17 @@ Candidate changes: r1878997, r1879192, r1879474, r1879959 (Fix issue #4859) Votes: +1: julianfoad + -1: jcorvel (test FAIL on Windows; + +1 if r1881985 group (see below) is backported too) + + * r1881985, r1882105 + Follow up to r1880192: Fix an EOL issue in test on Windows. + Justification: + We should test correctly on Windows environment, too. + Depends: + r1880192 + Votes: + +1: jcorvel Veto-blocked changes: =
svn commit: r1884583 - /subversion/branches/1.10.x/STATUS
Author: jcorvel
Date: Fri Dec 18 00:23:24 2020
New Revision: 1884583
URL: http://svn.apache.org/viewvc?rev=1884583&view=rev
Log:
* 1.10.x/STATUS: Vote for and approve r1879198.
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=1884583&r1=1884582&r2=1884583&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Dec 18 00:23:24 2020
@@ -55,18 +55,6 @@ Candidate changes:
Votes:
+1: jamessan
- * r1879198
- Fix an invalid quoting in working copy upgrade system that only works
- because SQLite automatically fixed this. More recent SQLite functions
- will signal an error when deprecated features are disabled.
- Justification:
- Causes user-visible errors.
- Note:
- 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
-
* r1878997, r1879192, r1879474, r1879959
Fix issue #4859, Merge removing a folder with non-inheritable mergeinfo
-> E155023: can't set properties: invalid status for updating properties
@@ -97,3 +85,15 @@ Approved changes:
Fixes potential crash in apr_pstrcat(). Pretty obvious fix.
Votes:
+1: stsp, jamessan, jcorvel
+
+ * r1879198
+ Fix an invalid quoting in working copy upgrade system that only works
+ because SQLite automatically fixed this. More recent SQLite functions
+ will signal an error when deprecated features are disabled.
+ Justification:
+ Causes user-visible errors.
+ Note:
+ 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, jcorvel
svn commit: r1884582 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Fri Dec 18 00:19:33 2020 New Revision: 1884582 URL: http://svn.apache.org/viewvc?rev=1884582&view=rev Log: * 1.10.x/STATUS: Vote for and approve r1876054. Also vote for r1874850, noting that we might soon need another bump of the copyright year. 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=1884582&r1=1884581&r2=1884582&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Dec 18 00:19:33 2020 @@ -39,19 +39,14 @@ Candidate changes: Votes: +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, jamessan - * r1874850 Update copyright year to 2020. Justification: The future is here! Votes: +1: stsp + +1: jcorvel (though by the time we get to this, we might need 2021, + in that case, +1 too) * r1875602 Remove incorrect include paths from svn_cv_ruby_includes. @@ -95,3 +90,10 @@ Veto-blocked changes: Approved changes: = + + * 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, jamessan, jcorvel
svn commit: r1884580 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Fri Dec 18 00:07:09 2020 New Revision: 1884580 URL: http://svn.apache.org/viewvc?rev=1884580&view=rev Log: * 1.14.x/STATUS: Vote for and approve r1875675. 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=1884580&r1=1884579&r2=1884580&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Dec 18 00:07:09 2020 @@ -35,13 +35,6 @@ Candidate changes: Votes: +1: futatuki, jcorvel - * r1875675 - Rewrite load_normalize_node_props to avoid literal trailing spaces. - Justification: - Prevents the bug fixed in r1875620 from recurring. - Votes: - +1: danielsh, brane - * r1877310 Add a test for issue #4711 "invalid xml file produced by svn log --xml --verbose --use-merge-history --search". @@ -104,3 +97,10 @@ Approved changes: Annoying failure, encountered in real use. Votes: +1: julianfoad, hartmannathan, jcorvel + + * r1875675 + Rewrite load_normalize_node_props to avoid literal trailing spaces. + Justification: + Prevents the bug fixed in r1875620 from recurring. + Votes: + +1: danielsh, brane, jcorvel
svn commit: r1884579 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Dec 17 23:50:27 2020 New Revision: 1884579 URL: http://svn.apache.org/viewvc?rev=1884579&view=rev Log: * 1.14.x/STATUS: Add -1 vote to r1880192 (issue #4862), because the test fails on Windows. Vote for the test fix (r1881985 group). If the test fix gets enough votes too, my vote for r1880192 can be converted to +1. 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=1884579&r1=1884578&r2=1884579&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Dec 17 23:50:27 2020 @@ -23,15 +23,17 @@ Candidate changes: r1878997, r1879192, r1879474, r1879959 (Fix issue #4859) Votes: +1: julianfoad, hartmannathan + -1: jcorvel (test FAIL on Windows; + +1 if r1881985 group (see below) is backported too) * r1881985, r1882105 Follow up to r1880192: Fix an EOL issue in test on Windows. Justification: We should test correctly on Windows environment, too. Depends: - rr1880192 + r1880192 Votes: - +1: futatuki + +1: futatuki, jcorvel * r1875675 Rewrite load_normalize_node_props to avoid literal trailing spaces.
svn commit: r1884577 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Dec 17 23:20:57 2020 New Revision: 1884577 URL: http://svn.apache.org/viewvc?rev=1884577&view=rev Log: * 1.14.x/STATUS: Vote for and approve r1878997 group (issue #4859). 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=1884577&r1=1884576&r2=1884577&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Dec 17 23:20:57 2020 @@ -15,14 +15,6 @@ Status of 1.14.1: Candidate changes: == - * r1878997, r1879192, r1879474, r1879959 - Fix issue #4859, Merge removing a folder with non-inheritable mergeinfo - -> E155023: can't set properties: invalid status for updating properties - Justification: - Annoying failure, encountered in real use. - Votes: - +1: julianfoad, hartmannathan - * r1880192 Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic". Justification: @@ -102,3 +94,11 @@ Approved changes: only if both the user and the path match the repository-specific rule. Votes: +1: stsp, brane, jcorvel + + * r1878997, r1879192, r1879474, r1879959 + Fix issue #4859, Merge removing a folder with non-inheritable mergeinfo + -> E155023: can't set properties: invalid status for updating properties + Justification: + Annoying failure, encountered in real use. + Votes: + +1: julianfoad, hartmannathan, jcorvel
svn commit: r1884571 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Thu Dec 17 20:48:01 2020 New Revision: 1884571 URL: http://svn.apache.org/viewvc?rev=1884571&view=rev Log: * 1.14.x/STATUS: Vote for and approve r1882326 (issue #4762). 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=1884571&r1=1884570&r2=1884571&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Dec 17 20:48:01 2020 @@ -41,16 +41,6 @@ Candidate changes: Votes: +1: futatuki - * r1882326 - Fix issue #4762 "authz doesn't combine global and repository rules" - Justification: - Restore behaviour of SVN 1.9: It is now again possible to override - per-path access rules for specific users (and groups) at the global - level. Such global rules are overridden by repository-specific rules - only if both the user and the path match the repository-specific rule. - Votes: - +1: stsp, brane - * r1875675 Rewrite load_normalize_node_props to avoid literal trailing spaces. Justification: @@ -102,3 +92,13 @@ Approved changes: Allow building on older distros such as CentOS 7. Votes: +1: brane, hartmannathan, julianfoad + + * r1882326 + Fix issue #4762 "authz doesn't combine global and repository rules" + Justification: + Restore behaviour of SVN 1.9: It is now again possible to override + per-path access rules for specific users (and groups) at the global + level. Such global rules are overridden by repository-specific rules + only if both the user and the path match the repository-specific rule. + Votes: + +1: stsp, brane, jcorvel
svn commit: r1884489 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed Dec 16 07:12:50 2020 New Revision: 1884489 URL: http://svn.apache.org/viewvc?rev=1884489&view=rev Log: * 1.14.x/STATUS: Vote for and approve r1883570. 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=1884489&r1=1884488&r2=1884489&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Dec 16 07:12:50 2020 @@ -89,13 +89,6 @@ Candidate changes: Votes: +1: brane - * r1883570 - Fix C4204 errors while building swig-py with Python 3.9 on Windows. - Justification: - Allow building Python bindings with Python 3.9 on Windows. - Votes: - +1: jun66j5 - Veto-blocked changes: = @@ -110,3 +103,10 @@ Veto-blocked changes: Approved changes: = + + * r1883570 + Fix C4204 errors while building swig-py with Python 3.9 on Windows. + Justification: + Allow building Python bindings with Python 3.9 on Windows. + Votes: + +1: jun66j5, jcorvel
svn commit: r1884475 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed Dec 16 00:20:19 2020 New Revision: 1884475 URL: http://svn.apache.org/viewvc?rev=1884475&view=rev Log: * 1.14.x/STATUS: Vote for and approve r1882157, r1877338, r1883335 and r1883337. 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=1884475&r1=1884474&r2=1884475&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Dec 16 00:20:19 2020 @@ -49,13 +49,6 @@ Candidate changes: Votes: +1: futatuki - * r1882157 - Do not suggest --help -v for commands which do not support -v. - Justification: - The --help message for several commands is misleading. User complained. - Votes: - +1: stsp, brane - * r1882326 Fix issue #4762 "authz doesn't combine global and repository rules" Justification: @@ -96,28 +89,6 @@ Candidate changes: Votes: +1: brane - * r1877338 - Add SWIG4 support for SWIG Python binding on Windows. - Justification: - SWIG Python bindings should be able to build with SWIG4 on Windows, too - Votes: - +1: futatuki, jun66j5 - - * r1883335 - Fix unable to load *.pyd files with Python 3.8.x on Windows. - Justification: - Make Python bindings available with Python 3.8+ on Windows. - Votes: - +1: jun66j5 - - * r1883337 - Remove uses of os.dup2() from run_tests.py in order to adapt the new - console reader and writer on Windows since Python 3.6. - Justification: - PYTHONLEGACYWINDOWSSTDIO is no longer needed to run unit tests on Windows. - Votes: - +1: jun66j5 - * r1883570 Fix C4204 errors while building swig-py with Python 3.9 on Windows. Justification: @@ -139,3 +110,32 @@ Veto-blocked changes: Approved changes: = + + * r1882157 + Do not suggest --help -v for commands which do not support -v. + Justification: + The --help message for several commands is misleading. User complained. + Votes: + +1: stsp, brane, jcorvel + + * r1877338 + Add SWIG4 support for SWIG Python binding on Windows. + Justification: + SWIG Python bindings should be able to build with SWIG4 on Windows, too + Votes: + +1: futatuki, jun66j5, jcorvel + + * r1883335 + Fix unable to load *.pyd files with Python 3.8.x on Windows. + Justification: + Make Python bindings available with Python 3.8+ on Windows. + Votes: + +1: jun66j5, jcorvel + + * r1883337 + Remove uses of os.dup2() from run_tests.py in order to adapt the new + console reader and writer on Windows since Python 3.6. + Justification: + PYTHONLEGACYWINDOWSSTDIO is no longer needed to run unit tests on Windows. + Votes: + +1: jun66j5, jcorvel
svn propchange: r1884474 - svn:log
Author: jcorvel Revision: 1884474 Modified property: svn:log Modified: svn:log at Tue Dec 15 23:18:07 2020 -- --- svn:log (original) +++ svn:log Tue Dec 15 23:18:07 2020 @@ -1,3 +1,3 @@ * win-tests.py: Add the new required test Location - "/authz-test-work/in-repo-authz" to the generated httpd config file. + "/authz-test-work/in-repos-authz" to the generated httpd config file. (Followup for r1883839 and r1883990, applied to Windows)
svn commit: r1884474 - /subversion/trunk/win-tests.py
Author: jcorvel Date: Tue Dec 15 23:16:14 2020 New Revision: 1884474 URL: http://svn.apache.org/viewvc?rev=1884474&view=rev Log: * win-tests.py: Add the new required test Location "/authz-test-work/in-repo-authz" to the generated httpd config file. (Followup for r1883839 and r1883990, applied to Windows) Modified: subversion/trunk/win-tests.py Modified: subversion/trunk/win-tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1884474&r1=1884473&r2=1884474&view=diff == --- subversion/trunk/win-tests.py (original) +++ subversion/trunk/win-tests.py Tue Dec 15 23:16:14 2020 @@ -772,6 +772,9 @@ class Httpd: local_tmp = os.path.join(self.abs_builddir, CMDLINE_TEST_SCRIPT_NATIVE_PATH, 'svn-test-work', 'local_tmp') +repositories = os.path.join(self.abs_builddir, +CMDLINE_TEST_SCRIPT_NATIVE_PATH, +'svn-test-work', 'repositories') return \ '' + '\n' \ ' DAV svn' + '\n' \ @@ -787,6 +790,17 @@ class Httpd: ' ' + '\n' \ ' SVNPathAuthz ' + self.path_authz_option + '\n' \ '' + '\n' \ + '' + '\n' \ + ' DAV svn' + '\n' \ + ' SVNParentPath ' + repositories + '\n' \ + ' AuthzSVNReposRelativeAccessFile "^/authz"\n' \ + ' SVNAdvertiseV2Protocol ' + self.httpv2_option + '\n' \ + ' AuthType Basic' + '\n' \ + ' AuthName "Subversion Repository"' + '\n' \ + ' AuthUserFile' + self._quote(self.httpd_users) + '\n' \ + ' Require valid-user' + '\n' \ + ' SVNPathAuthz ' + self.path_authz_option + '\n' \ + '' + '\n' \ '' + '\n' \ ' DAV svn' + '\n' \ ' SVNParentPath ' + local_tmp + '\n' \
svn commit: r1878195 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed May 27 19:15:38 2020 New Revision: 1878195 URL: http://svn.apache.org/viewvc?rev=1878195&view=rev Log: * 1.14.x/STATUS: Vote for r1876707 group, and tweak description to be more general for the entire group of revisions. 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=1878195&r1=1878194&r2=1878195&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed May 27 19:15:38 2020 @@ -33,12 +33,13 @@ Candidate changes: * r1876707, r1876734, r1877318, r1877712, r1878141, r1878142, r1878143, r1878144 - Escape special characters in path when construct expected output regex. + Various fixes for making the test suite run correctly with Python 3 on + Windows. Justification: - Our test suit should test Subversion correctly also on Windows with + Our test suite should test Subversion correctly also on Windows with Python 3 Votes: - +1: futatuki + +1: futatuki, jcorvel * r1876906 Make gen-make.py --debug work with Python 3
svn commit: r1878193 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed May 27 18:45:56 2020 New Revision: 1878193 URL: http://svn.apache.org/viewvc?rev=1878193&view=rev Log: * 1.14.x/STATUS: Nominate r1876906 (Make gen-make.py --debug work with Python 3). 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=1878193&r1=1878192&r2=1878193&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed May 27 18:45:56 2020 @@ -40,6 +40,14 @@ Candidate changes: Votes: +1: futatuki + * r1876906 + Make gen-make.py --debug work with Python 3 + Justification: + We should also be able to build in Debug configuration with Python 3 + on Windows. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1878190 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed May 27 18:42:12 2020 New Revision: 1878190 URL: http://svn.apache.org/viewvc?rev=1878190&view=rev Log: * 1.14.x/STATUS: Vote for r1877259, 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=1878190&r1=1878189&r2=1878190&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed May 27 18:42:12 2020 @@ -23,15 +23,6 @@ Candidate changes: Votes: +1: danielsh, stsp -* r1877259 -Move variable declarations to the start of block the to fix -syntax errors with VC9 (Visual Studio 2008). - Justification: -Our code should be C90. - Votes: -+1: brane, stsp -+0: danielsh (from dev@) - * r1877960 * INSTALL (I.C.12): Add Note that non-release mode is required for building SWIG Python 2 bindings. @@ -62,3 +53,12 @@ Approved changes: Error messages should be accurate. User reported (issue #4854). Votes: +1: danielsh, stsp, jcorvel + +* r1877259 +Move variable declarations to the start of block the to fix +syntax errors with VC9 (Visual Studio 2008). + Justification: +Our code should be C90. + Votes: ++1: brane, stsp, jcorvel ++0: danielsh (from dev@)
svn commit: r1878189 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Wed May 27 18:39:53 2020 New Revision: 1878189 URL: http://svn.apache.org/viewvc?rev=1878189&view=rev Log: * 1.14.x/STATUS: Vote for r1877072, 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=1878189&r1=1878188&r2=1878189&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed May 27 18:39:53 2020 @@ -23,14 +23,6 @@ Candidate changes: Votes: +1: danielsh, stsp - * r1877072 - svnmucc: Change an error message to state another possible cause of the - error. - Justification: - Error messages should be accurate. User reported (issue #4854). - Votes: - +1: danielsh, stsp - * r1877259 Move variable declarations to the start of block the to fix syntax errors with VC9 (Visual Studio 2008). @@ -62,3 +54,11 @@ Veto-blocked changes: Approved changes: = + + * r1877072 + svnmucc: Change an error message to state another possible cause of the + error. + Justification: + Error messages should be accurate. User reported (issue #4854). + Votes: + +1: danielsh, stsp, jcorvel
svn propchange: r1878141 - svn:log
Author: jcorvel Revision: 1878141 Modified property: svn:log Modified: svn:log at Wed May 27 18:20:49 2020 -- --- svn:log (original) +++ svn:log Wed May 27 18:20:49 2020 @@ -1,4 +1,4 @@ -Follow-up to r187712: entries-dump: Use escape string-typed value for two +Follow-up to r1877712: entries-dump: Use escape string-typed value for two more char * type values. * subversion/tests/cmdline/entries-dump.c
svn commit: r39770 - /dev/subversion/subversion-1.14.0.zip.asc
Author: jcorvel Date: Tue May 26 09:03:02 2020 New Revision: 39770 Log: Add my signature for 1.14.0 (Windows) Modified: dev/subversion/subversion-1.14.0.zip.asc Modified: dev/subversion/subversion-1.14.0.zip.asc == --- dev/subversion/subversion-1.14.0.zip.asc (original) +++ dev/subversion/subversion-1.14.0.zip.asc Tue May 26 09:03:02 2020 @@ -24,3 +24,19 @@ LK74qDzgKxkWVWBqgimpyL7L9/H99lR6Boq7hP8D OWzba+5DFy3Rcf6U8denP22l6XxnVjZiMYnGNaQCV9N/gdRX7+k= =wOK+ -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJezDDpAAoJELWc5tYBDIqt1OoQALlgOq97zfzRTnGROVdRPe2b +L9/jNnwwZ0ceVWYzrr4lGZUXDSfkA/Q2l86FXEBZFb9CP+B45a8AUG4bQL4cmz1C +88/QrxR2cOLkRp94Vq5l35Vn4brMQCGxXvV13j7q0G9Oi47DYzmUuS3na/4+olZh +/axf4kBXo2DyEEs5Ng8zqNgbdBgHqUUQEWQ2sR0F8lWZqQmA9tyGsTsWbgs26C+c +COUTBVLVUJnGxEVN3sMXPlQfXURjZquUqcWbkL7455JWleuXg/WuoHRc5YbFIHLU +9zL9n5OuF37JcedUIy0Rkh9kI9jq/O6QQIIPX9HMPEjUDqsJo48O6NjXe4FLp+Qg +ABy9RvmHLBWHkujIpyJkMfrcdi6oYnqqOg9NHN+46l74Px5m9NXnaDOim1YVxad4 +I9L34oFtNa3Af/oN1p3DP4PA42/L4woCw0if+rfsDq40ZxPRsjHzA/ja6scbO5A1 +pSdE+Gwde/j2uYCx2m0EtGkRcPu/n5mHKNt2t7LjaTtmqQ8SKBHY1KHmu9je8sfh ++xSYW80C0vp8zctbsfObolipugCIZvO4hr0uzpbRkttckqqmdNPsGbSrtXIXjhp2 +TnirWMJfVtQCLPOzkFccOo44AIoTZq364oSMD/8Ph1qZMhrqykNp6K08dKrCTMVW +5uqPs3pMDItAib1HSPaW +=vs0u +-END PGP SIGNATURE-
svn commit: r38959 - /dev/subversion/subversion-1.14.0-rc2.zip.asc
Author: jcorvel Date: Wed Apr 15 00:45:43 2020 New Revision: 38959 Log: Add my signature for 1.14.0-rc2 (Windows) Modified: dev/subversion/subversion-1.14.0-rc2.zip.asc Modified: dev/subversion/subversion-1.14.0-rc2.zip.asc == --- dev/subversion/subversion-1.14.0-rc2.zip.asc (original) +++ dev/subversion/subversion-1.14.0-rc2.zip.asc Wed Apr 15 00:45:43 2020 @@ -8,3 +8,19 @@ VU4BHbu0ta2iYg7iM26bmmkw2XtROGjJX8SRcCbe ylgkME6CNnZNL7uyyD3ewkf9nlo74WdQJyH5G8J6gg6Gvrx5XupC5f8kO46Uj8U= =y8Rr -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQIcBAABCgAGBQJellhmAAoJELWc5tYBDIqtEWkQAIMD9LqZx/rUK17JLQbVZOOr +KQuQ7fm2nNDZXbgFA48RV37lJxT6Lexv0kOxuCkiBi1iiNqWq8AGCMVH3XAusvYu +qIe4VCHqmJeepGSYr+MVXIoRz7zASEqmX+PtLcEoUDA3tFj0Dn+/AjnMLzByJUXr +dnix3h+gV05W1PY7KDGwnLQsjhUMe3fGuSSLxSQtE3SMxU24F5xq/8ytImN4k6JV +E9dvla6DxE+0+L17IjiRoaCx6K6Gi6ujIqVbk25secRPC4aT0PivnSwZxCrBR3dS +32seUDVl1gkQkRc9NqSSuONwQUBC6kyKFVKWR/q6odnpNueq1RCCb8PCLLLTlOhg +mS4dIVVCx4YYA/9vV4FihUiWNf4VpYx/G8UvFUm8dC+DXllaEZyRTAB8+PSvvKuh +ahoUgHikOD2Y6y17D/qCEjEBGiB/TS7H0BXgSDpeY6F/zKKDF0897x8u0P6o7w1Z +RMN0G7ladUl/QNOgQUIU0vlQ4Vq+NbM9YSAHJ6bfKiP5wYEBVlz55le78Lm1xzsW +roxbX44vlsnmp5+ODW3nB9AFSH2iVKXm6htCSkaaa4XOWa0KxNVMRmum3jMlTPaN +lIgBDyoZer1wp7er0j6UAyVFW8mC1HVuAxenzAHovp2nYYWHe2TpUT2kkrT2N0al +ywVv1Rt1HVKN+/XVYA+h +=6zZv +-END PGP SIGNATURE-
svn commit: r1876208 - /subversion/branches/1.14.x/STATUS
Author: jcorvel Date: Tue Apr 7 00:00:13 2020 New Revision: 1876208 URL: http://svn.apache.org/viewvc?rev=1876208&view=rev Log: * 1.14.x/STATUS: Vote for r1876068, 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=1876208&r1=1876207&r2=1876208&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Tue Apr 7 00:00:13 2020 @@ -22,14 +22,6 @@ Candidate changes: Votes: +1: jamessan, stsp - * 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, stsp - Veto-blocked changes: = @@ -89,3 +81,11 @@ Approved changes: Votes: +1: stsp, jamessan, hartmannathan + * 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, stsp, jcorvel +
svn commit: r36524 - /dev/subversion/subversion-1.13.0.zip.asc
Author: jcorvel Date: Mon Oct 28 13:41:45 2019 New Revision: 36524 Log: Add my signature for 1.13.0 (Windows) Modified: dev/subversion/subversion-1.13.0.zip.asc Modified: dev/subversion/subversion-1.13.0.zip.asc == --- dev/subversion/subversion-1.13.0.zip.asc (original) +++ dev/subversion/subversion-1.13.0.zip.asc Mon Oct 28 13:41:45 2019 @@ -14,3 +14,20 @@ P0HAyWQ5tYgtM8isyCvPxsV39ujy1XZ8NZ/MDP91 9FzmFDDmA8eNexOiuvJrG6KWakOn1j8kav+DFSbh1vdqgKtAHGg= =Fh5m -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJdtu/XAAoJELWc5tYBDIqtI8kP/j0MT4/HgkdtGtjEQxnmUeFa +MvDDZN8+dMnT6fD1sW7ZAupMuvrxLqNMIwYv+I9NZtZ7JA75nlA5u/JcAoThIQ+c +q3UPq2izimHw4cDW01+6KdK8iVaTJRzebas4bFSdku8aVCbialXTqkiZROXeN6MU +kEkdMm3x9cufZOl5zrAxuiWVJhv6tL0z7nSTEdwTv6YrbG+oxOrZ1jSyghuQoDsG +jXTQ1Gdb2mQYauj0efQX3bw9DfBRdYM661iOy6ZwliV9V9G8rOl1l20BFEfQIwEZ +LdWaIRlH5Tm6xD3Ljl7RUU6/Ln2lDBw5nO6cOYkl+Eo1z2UtkaREZKMHBc7oEljL +EGtV2zckrC6MB4B8hZPqX0Ic3mZT6+beWt8DQzvMWBp9YPWKvnwIQ10G8RSmBPyd +p0bvXQN9Y+JFeKALzc6vEikIwPzjvCmI5FPMQkDqwavy4nghU6FxRLODmKu8v1JV +rCjt6kwcOqqCP6DykUzlzPmFB6uJPAkQCyF72BS6MH8MxjJ0YhPcV7Bh/7B91sle +7Ssx7uOO9DCyb83ut6h6ZG6qPaFdPrR2wqUX+8aWC8y5jzfSq58dA90NDR3mzhFf +nID+brl856MCGL9Y92/iLAayIsFhbg/iDoRzzjh0bfwKahy1Q6AcWvBViDiRcCpM +TAuNe1EtG2rObLvKrCWO +=1Pcx +-END PGP SIGNATURE-
svn commit: r35982 - /dev/subversion/subversion-1.13.0-rc1.zip.asc
Author: jcorvel Date: Tue Sep 24 06:21:05 2019 New Revision: 35982 Log: Add my signature for 1.13.0-rc1 (Windows) Modified: dev/subversion/subversion-1.13.0-rc1.zip.asc Modified: dev/subversion/subversion-1.13.0-rc1.zip.asc == --- dev/subversion/subversion-1.13.0-rc1.zip.asc (original) +++ dev/subversion/subversion-1.13.0-rc1.zip.asc Tue Sep 24 06:21:05 2019 @@ -14,3 +14,20 @@ mevkvehonjigsgxQWdHaDmN/dQfG561YqnUMmMKR WHpdy+FElAugA2OEph+jgGI4nFdsu2ySvsHVUngWjswEd4Ij4ps= =rKQG -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJdiTYgAAoJELWc5tYBDIqt6mcP/0GbPvfijgW+eCSpqkR9NPXC +lMJ6h/+7Xq0/68tuRjyN9r7RSwEDkNMzhjY8+4T37XCFhZn5MpJ0rJgBmViGl0DM +Pj3uyVl8J1eHa4l1CbqyA4QJ9qnAr3HIxFXiNOIioblthR/s7fWgloJX+psbvERJ +SCGNdbN4iUHMXSZy4THBDyxLoR1OOwC7LPopzwbFd/lxVZsLAP5o8F/oeD69hhS1 +HThSpeZS3Ik8r7pYxQx3E2+tuWBhT6CDSWthrnJ8tKNvgYhcK8d+2zrr9Vg+pL3w +ybO1ZoMhz8yRUqBXsjbqGuNvsoVGBgquj8MLuksz7qFCh5H0Tzh4F3dYAdkr9isz +m0AGJTcdD25f/LNpN4dbK21vTqayqbssJBoq5UbwdQu7lXL4r6P6SP2gAVOAZ1Qm +yukiO6imNYUwqeMXOX3HDhgZPkZ0qURZ0LXRpNA7QFVILSvuOe4Z71IZw9vBePDj ++L01EJQNL4lomcDpA+yhb6PmC+iNz4PSFhWHQD9e9gzIsSyO+rMRSYpsbAXdRRBl +n+lYZDYJURIzdsuoDZCf57bh2hzetBu+qIMU0Nf0xSgktg3y1zQRv6vpS4v+q2Os +W00JlxMe89qyFkxJYKhsOKBd8pgYS2qOEHOtXK9stuDtLn4l91H4uyjOBC8z/GpZ +c/NIJ5Dx3iovatWjVgnC +=+KT8 +-END PGP SIGNATURE-
svn commit: r1866660 - /subversion/branches/1.12.x/STATUS
Author: jcorvel Date: Mon Sep 9 07:07:13 2019 New Revision: 180 URL: http://svn.apache.org/viewvc?rev=180&view=rev Log: * STATUS: Nominate r1866425 (Last-Modified header) for 1.12.x too. 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=180&r1=1866659&r2=180&view=diff == --- subversion/branches/1.12.x/STATUS (original) +++ subversion/branches/1.12.x/STATUS Mon Sep 9 07:07:13 2019 @@ -30,6 +30,16 @@ Candidate changes: Votes: +1: brane + * r1866425 + mod_dav_svn: Set Last-Modified response header for 'external' GET requests. + Justification: + The Last-Modified header was removed in r1724790 for performance reasons. + However, for external requests the Last-Modified header is needed for + certain use cases. Bringing it back only for external requests fixes + these, while keeping the performance gain for checkout / update. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1866581 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Sat Sep 7 23:43:58 2019 New Revision: 1866581 URL: http://svn.apache.org/viewvc?rev=1866581&view=rev Log: * STATUS: Vote for and approve r1865266. 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=1866581&r1=1866580&r2=1866581&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Sat Sep 7 23:43:58 2019 @@ -29,14 +29,6 @@ Candidate changes: User complained: https://svn.haxx.se/dev/archive-2019-07/0072.shtml Votes: +1: stsp, rhuijben - - * r1865266 - mod_dav_svn: Always install cleanup handler for FS warning logging. - Justification: - FS warning logging cleanup handler was only installed in the presence - of an R->USER request field, which is unrelated. - Votes: - +1: stsp, rhuijben * r1866425 mod_dav_svn: Set Last-Modified response header for 'external' GET requests. @@ -53,3 +45,11 @@ Veto-blocked changes: Approved changes: = + + * r1865266 + mod_dav_svn: Always install cleanup handler for FS warning logging. + Justification: + FS warning logging cleanup handler was only installed in the presence + of an R->USER request field, which is unrelated. + Votes: + +1: stsp, rhuijben, jcorvel
svn commit: r1866580 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Sat Sep 7 23:42:06 2019 New Revision: 1866580 URL: http://svn.apache.org/viewvc?rev=1866580&view=rev Log: * STATUS: Nominate r1866425 (mod_dav_svn: Set Last-Modified response header for 'external' GET requests.) 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=1866580&r1=1866579&r2=1866580&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Sat Sep 7 23:42:06 2019 @@ -38,6 +38,16 @@ Candidate changes: Votes: +1: stsp, rhuijben + * r1866425 + mod_dav_svn: Set Last-Modified response header for 'external' GET requests. + Justification: + The Last-Modified header was removed in r1724790 for performance reasons. + However, for external requests the Last-Modified header is needed for + certain use cases. Bringing it back only for external requests fixes + these, while keeping the performance gain for checkout / update. + Votes: + +1: jcorvel + Veto-blocked changes: =
svn commit: r1866425 - in /subversion/trunk/subversion: mod_dav_svn/repos.c tests/cmdline/mod_dav_svn_tests.py
Author: jcorvel
Date: Thu Sep 5 00:00:59 2019
New Revision: 1866425
URL: http://svn.apache.org/viewvc?rev=1866425&view=rev
Log:
mod_dav_svn: Set Last-Modified response header for 'external' GET requests
(i.e. requests to URI's not under /!svn). This partially reverts r1724790
which removed it for all GET requests, for performance reasons (however, for
external requests the Last-Modified header is needed for certain use cases).
See this thread on dev@:
https://lists.apache.org/thread.html/51f4f1fb5363c1d1c393f6ab769b12b9c7914af583fc333c652306d0@%3Cdev.subversion.apache.org%3E
Date: 2019/09/02 14:20:16 GMT
From: Johan Corveleyn
To: Subversion dev list
Subject: Re: Last-Modified HTTP header in GET responses
Message-ID:
Review by: brane
* subversion/mod_dav_svn/repos.c
(get_last_modified): New function (reverted its removal in r1724790).
(set_headers): Set Last-Modified response header for 'external' requests.
* subversion/tests/cmdline/mod_dav_svn_tests.py
(last_modified_header): New test.
Modified:
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1866425&r1=1866424&r2=1866425&view=diff
==
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Thu Sep 5 00:00:59 2019
@@ -3139,6 +3139,50 @@ seek_stream(dav_stream *stream, apr_off_
&& resource->baselined))
+/* Return the last modification time of RESOURCE, or -1 if the DAV
+ resource type is not handled, or if an error occurs. Temporary
+ allocations are made from RESOURCE->POOL. */
+static apr_time_t
+get_last_modified(const dav_resource *resource)
+{
+ apr_time_t last_modified;
+ svn_error_t *serr;
+ svn_revnum_t created_rev;
+ svn_string_t *date_time;
+
+ if (RESOURCE_LACKS_ETAG_POTENTIAL(resource))
+return -1;
+
+ if ((serr = svn_fs_node_created_rev(&created_rev, resource->info->root.root,
+ resource->info->repos_path,
+ resource->pool)))
+{
+ svn_error_clear(serr);
+ return -1;
+}
+
+ if ((serr = svn_fs_revision_prop2(&date_time, resource->info->repos->fs,
+created_rev, SVN_PROP_REVISION_DATE,
+TRUE, resource->pool, resource->pool)))
+{
+ svn_error_clear(serr);
+ return -1;
+}
+
+ if (date_time == NULL || date_time->data == NULL)
+return -1;
+
+ if ((serr = svn_time_from_cstring(&last_modified, date_time->data,
+resource->pool)))
+{
+ svn_error_clear(serr);
+ return -1;
+}
+
+ return last_modified;
+}
+
+
const char *
dav_svn__getetag(const dav_resource *resource, apr_pool_t *pool)
{
@@ -3219,6 +3263,23 @@ set_headers(request_rec *r, const dav_re
if (!resource->exists)
return NULL;
+ if ((resource->type == DAV_RESOURCE_TYPE_REGULAR)
+ && (resource->info->repos_path == resource->info->uri_path->data))
+{
+ /* Include Last-Modified header for 'external' GET or HEAD requests
+ (i.e. requests to URI's not under /!svn), to support usage of an
+ SVN server as a file server, where the client needs timestamps
+ for instance to use as "last modification time" of files on disk. */
+ const apr_time_t last_modified = get_last_modified(resource);
+ if (last_modified != -1)
+{
+ /* Note the modification time for the requested resource, and
+ include the Last-Modified header in the response. */
+ ap_update_mtime(r, last_modified);
+ ap_set_last_modified(r);
+}
+}
+
/* generate our etag and place it into the output */
apr_table_setn(r->headers_out, "ETag",
dav_svn__getetag(resource, resource->pool));
Modified: subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py?rev=1866425&r1=1866424&r2=1866425&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mod_dav_svn_tests.py Thu Sep 5
00:00:59 2019
@@ -640,6 +640,53 @@ def propfind_propname(sbox):
actual_response = r.read()
verify_xml_response(expected_response, actual_response)
+@SkipUnless(svntest.main.is_ra_type_dav)
+def last_modified_header(sbox):
+ "verify 'Last-M
svn commit: r34983 - /dev/subversion/subversion-1.9.12.zip.asc
Author: jcorvel Date: Tue Jul 23 07:01:50 2019 New Revision: 34983 Log: Add my signature for 1.9.12 (Windows). Modified: dev/subversion/subversion-1.9.12.zip.asc Modified: dev/subversion/subversion-1.9.12.zip.asc == --- dev/subversion/subversion-1.9.12.zip.asc (original) +++ dev/subversion/subversion-1.9.12.zip.asc Tue Jul 23 07:01:50 2019 @@ -14,3 +14,20 @@ f/ISHNNEglW17uXsiQBWMDgYAWUxbe0AtDCqZUuw mEnwpvigWhapiqFzk7xFajrN+4gDXuL9Hyw7vlx9FEYp+P+Sa6k= =GD2b -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJdNga/AAoJELWc5tYBDIqtRm0P/1ilAsV6P42hChlS7TtWUAXZ +RxWPiHSK5kvIB0JGAQ8hwEWqvBXziFxZdnzTaZQ8fPCZDsLZtP0zGTXfCLaS9n9f +u0h7KRm4jYivAMDrPH2KV5S7y3xFHr8/On9alZT7v36YSLuM9NKccjh+HiNXPIl8 +H9U956BShy8Mlr52SsWHGhE480WKSQpLzLfy54i+1KsnGJP4ukkRQ1RViEa9twx4 +Vf/nKh4pUi3AJUHEdYPw/V3514aQLRRypKDhFZna7JhFv1gNwyrkD5Q+pH3m4gau +DjtsneKTIq7kxUAQG6IsWeRYtImpINtj3b5mDZglaWqCVWGB9W3ZBH9yuXuZ4Lgy +otXGCZHsLG11o1HFoy2zqIXsTRsbM1lUSHWd3K+es832kee/1HEG6LhHwhwvaN2G +SvUB3dcNKUms0v0SBX9GDqhUXuYracVZzZpovRxaBVuAYvuII+js/VHG8GgTlRH/ +OkVN0qbd+NPxAbjExwrR9lmv7vKUlXEYLpAtCukORo7nk+A1qw0YdKrtKfZWzuut +jGJ2xclYZnx35RNpgjpPQ1T2o4ncLBPzTvDn9Sr4QBUepxVSIT8IFi4wMBkaukpt +t3ieVpXHdkwb+XPzJYL+biiTyOX33XCK/B1ERfrXPeMvgsOehFRJN4JSPj4GlxBI +JOTLkBhPFEIeHV9uEAjd +=sNfp +-END PGP SIGNATURE-
svn commit: r34970 - /dev/subversion/subversion-1.10.6.zip.asc
Author: jcorvel Date: Mon Jul 22 18:55:07 2019 New Revision: 34970 Log: Add my signature for 1.10.6 (Windows). Modified: dev/subversion/subversion-1.10.6.zip.asc Modified: dev/subversion/subversion-1.10.6.zip.asc == --- dev/subversion/subversion-1.10.6.zip.asc (original) +++ dev/subversion/subversion-1.10.6.zip.asc Mon Jul 22 18:55:07 2019 @@ -14,3 +14,20 @@ ISsU1q+00xQlhg78/aFYsG0rh621MwoYmgLQqt5j yauCQ7Ot46RiOokf8oka+zVSoHzVE5R4Y1Gqg4bBHgGZhgm9DFs= =WmQB -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJdNgY9AAoJELWc5tYBDIqt0KUP/1jRZbRX1aaGVpbcg6oXOqqP +RANze9vFXAU1rz4hFXhb8VYoB4DCCzwbHPd9chRtskB8iGsYCRvn7KRSSwa6QWmY +AP5roVrQkTHvk/sjoD9CbNF2ttlEwQKBbNXp68jHs1dG3NV+Pk6i+LDQJ7BDMhxZ +kFgvEZRp/3CyNmNGmkuc1CRmuWFGlz6ktNMNVmQc2DXWhO6qJlKDRux39XQBk9qi +44ba29VXlys4gg1w9J5Wle+/EVIj7zhDU/u4+e9D3JX91x9WrPS3Y4WmmLB0wIGQ +Zb2UL5yLfbcvExelCEjqh8F2D8wIyWPxR0nQCXwktdA1tdCWoNPJ2sy8rfIvS1vI +xg2VMb0sTgOogKDZb3mIaiCRq3yzp0RkkjQ5Wy1APq9MezGw0lFda4MFXG/HgF9v +7p5gUnfpgvO+O2Ja7Tkt7rM8rxknfrSW72hyUu6miB0L7BEbveGoCGQtJX2OrPn0 +pKLgRsi5GYF114AVmfiPzcoRXUxRcajTRRpbghcEWirSPwzAmCDSgVIF2QnqvShU +Q2vXA5QcNutVqwHSqw4HJ1nD6VnbB1quPZK90lsQxsi5jEsHzP+NCXf2EYX5ROlU +vio+ceUXr/NvV2QCHr7P/6TBX9lT9rkCGMYnUrk1692l6TGZddRl79n0C/gp+RjS +Kr2NGyBzL1Jj7/EOiD8a +=5KjO +-END PGP SIGNATURE-
svn commit: r34968 - /dev/subversion/subversion-1.12.2.zip.asc
Author: jcorvel Date: Mon Jul 22 18:52:27 2019 New Revision: 34968 Log: Add my signature for 1.12.2 (Windows). Modified: dev/subversion/subversion-1.12.2.zip.asc Modified: dev/subversion/subversion-1.12.2.zip.asc == --- dev/subversion/subversion-1.12.2.zip.asc (original) +++ dev/subversion/subversion-1.12.2.zip.asc Mon Jul 22 18:52:27 2019 @@ -14,3 +14,20 @@ iK3GmHGEcs17UiyNrVs05+GyRgUgm3ZuKjPisZ2G NnEX2nK3oIJcAtbDN/SWEV5I/llWQyehuLqiiidekDaFtbNl4VA= =xGLh -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJdNgWbAAoJELWc5tYBDIqtgbYP/2Dls9DeVj8eApRlanKARsDQ +ohHeEvje2lZi3Skgb2L+I9HgX8poeM6BkBP3V6Ryp70vxM7fTtz/22cDeY6hHqy5 +FeyfCtu0y4y+jOhut+u8lhGpHE8ZaKtoUe4MkmiF62j5jtw1kXR38VpFjopCfnFx +/as1P1RxMdUFPA/jR/ufbfROc+o4H3QIe+vqx1kyUiCYdaLOFJ1Xq8OKUeBoavOi +YxcmVCFZd23PbxM9VaRskDb0KtlCcsWq5Qk/B5RoXhN3g7C0sKg2D1PNXuCXTCIx +ehVShAdiUZR2VGfcps2K5PuikUzEy0njxgnAjWvdnnnyleLnO/50oBvQGAY1W25a +4kqA4/wf/bVMNLZKhg/qDFu/wasdOktNxTPBPYZ+WUXiEDBuDjfOBjnWvpRCNBDw +v55gFNN6yLDPnk7lh/cz3+/XsRd0+6hb8Z4+rPhpdcPX9sI2VWLqRQ4slBx0PjjD +HskXYEEFlCokD/+aLqIcKoSGhS0MA3nuhuOGJ72IINLMwIsD1BOefz58DDPCxhHV +xZxPw5iwnStTp6r3b8faewvkhpBOx74JHjdjqfuxyggkcfOX5sXPxD8WASY1zgfQ +8lYYXvyG4nfUPhS+SuWhJ69eEmTSpp11GpMyF7NfL9yLVl9oPWx6yfrmLz5SF9jQ +vUPDIWcK8blaZqsShrt7 +=u0z1 +-END PGP SIGNATURE-
svn commit: r33624 - /dev/subversion/subversion-1.12.0.zip.asc
Author: jcorvel Date: Sun Apr 14 00:14:31 2019 New Revision: 33624 Log: Add my signature for Subversion 1.12.0 (Windows) Modified: dev/subversion/subversion-1.12.0.zip.asc Modified: dev/subversion/subversion-1.12.0.zip.asc == --- dev/subversion/subversion-1.12.0.zip.asc (original) +++ dev/subversion/subversion-1.12.0.zip.asc Sun Apr 14 00:14:31 2019 @@ -14,3 +14,20 @@ WAFw4f8FHdyxTxydsxcCyqBxHAjdIxJF9ROYCGBZ 7OtlSr90goKw+eLqxUZR/kRd/eErbcAPN4mVvn4/nxFdqYOJXMA= =YSMw -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJcsm/BAAoJELWc5tYBDIqtXn8P/jHXNP0OQXDT2IZupy2aPRvV +5fuLVTngl/IUQwK8BIWReaCOJQ6L+ST33alOnHayDTojtR7U+wtkZj9hDawqFUVK +RkFGeBuMvv4ouICgLwJ6TAWkp48dUDB6wr5cbcpJO+aCcairKFYNMP7BUs2rKZGL +Nzpmd5yHyg00L0oMyYM4JheX5swSqysItrqUHTGiYydyytDVIsGgnp88h73l6dln +M4OiGZ+PC/9VarrR+xalSpGZ/aGaqVtPFJdqJ/OBtXNS85glBJtB47u8sTtM48f5 +fArrTz90bpagBBgVfRRqufy8u4jw6g9XplQs0h2gYdy/XTNQrS+CNxjsuQDfWokM +5XuzQ7ZReez0AIdGd6ujc00CRNS4W5goprqrHerdpXLs64MV4g/l8h50p/o/4fiK +4IWGxvJA8kRxQSRu+SjzQh4yIg4Jq/wpzo8/NXMyXX4dQM9I3u4Ctb94nOS1UDMW +iYRN0eau7c5aZqqde75/J2lIlW3Qc5WqMwHEiUz9fYaPCzy+YGG25EgxczSRqDaf +ti25w07q86gMfq4dUE4tb5S7C6h79outVyDPWi6G7v7T7BZ4msA77Ee5YPIoFfMs +wPV77KOAGbB6+LB3CCPvWeXumpoZpkhy4AX4spop7FYKdAfUHJaGK6C/9UoUEn2/ +9yTWYaFq5vzdduwL+vpi +=hzgo +-END PGP SIGNATURE-
svn commit: r32842 - /dev/subversion/subversion-1.12.0-rc1.zip.asc
Author: jcorvel Date: Sun Mar 10 22:15:26 2019 New Revision: 32842 Log: Add my signature for 1.12.0-rc1 (Windows) Modified: dev/subversion/subversion-1.12.0-rc1.zip.asc Modified: dev/subversion/subversion-1.12.0-rc1.zip.asc == --- dev/subversion/subversion-1.12.0-rc1.zip.asc (original) +++ dev/subversion/subversion-1.12.0-rc1.zip.asc Sun Mar 10 22:15:26 2019 @@ -15,3 +15,20 @@ pWPhcxjDICsJEPsSDzkpmg5KS9GZ7RFf0gTphnie d0kTSc4HCCv3z+m3//AE =s6ik -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJchYw5AAoJELWc5tYBDIqtK40P/3+ry4JOdZ1spr+o9cpuPvRt +InT4Mo1vyW/dgGeYU3CE5+/TUuQlDkBEWv/0cEIwOWmnui3gl3TupTk+gbTVqerP +3lDahrZ41nj/SSobHgIcTmDybFJp9VFOocxKBbaudJnAMW9ScECo34vt/gSlnKvr +m3z5zcx2zsBcbkbRK5PPKiq2HzjdzVpPalV6BEtqxVvDy/p05nT7UhltyvG0IxZF +WqUWtzHmSY8tmGxO8lg0PQ4vYP0ZwtDnUBKrPIss4emXoRkCP2oXdF028Y4Wmjho +m2zNdw/m4AXqCy5GGM3+AQnaQjK/7Ar8zXK24DoU4tPpPj9XOXLhTNh87HR167tc +7dVs9QB6HAZwRmUOpw+LiEZL3JzmCRITKhga+ysi+jNLKVPT8kSN46Fmmzmj76IM +HWbZjoI0leOI6el9BkgYS2g+ElbR7ai5kn9lkdxLSersvZckaGfMIvjnyNn6Vae9 +VxC2eXJXBDVEtIS9Mu3CTstpGTk9unEyaa6QX8c7ox4t7kRAp4tQtdt5b8Hh6tIg +PQvAgD6UZ3hOA1DqBJC2JRBLYpBiC+N9JI8GBYp0SqgGr5q4VK4p1CQZqYXp/keW +d/zC1X3FLu2oeT/2m1SXRRNKCBleP9p30YVhr9rrpebdO7igvsBa9wHYayVSpVjb +545H5+JXdIhKVh7E/G3x +=F6Mq +-END PGP SIGNATURE-
svn commit: r31833 - /dev/subversion/subversion-1.9.10.zip.asc
Author: jcorvel Date: Wed Jan 9 07:48:48 2019 New Revision: 31833 Log: Add my signature for 1.9.10 (Windows). Modified: dev/subversion/subversion-1.9.10.zip.asc Modified: dev/subversion/subversion-1.9.10.zip.asc == --- dev/subversion/subversion-1.9.10.zip.asc (original) +++ dev/subversion/subversion-1.9.10.zip.asc Wed Jan 9 07:48:48 2019 @@ -15,3 +15,20 @@ tZsM/Stmeo3BEQDcaJcjnFe+ObTIqdYoC8SJ1URV cAoYyckatOqc7FpxZi5k =pAA3 -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJcNabxAAoJELWc5tYBDIqts/4P/3pzFQk90OTxez9BcFY0nKqq +OApBkhNeEWEeGGlQEcQOvYQd+DyzMHz/JkAhAvdcS8As/tZAiQThA1QE8MZ8bAXn +CBXCxivVaDp2GQZLnqsGhZzEemUts1nM/YZHUxstjA2Cz2phOoWaaskYOtPNwIjn +ieZhX9UWCJGQ3gtP7OuV+G34VPLlN661dkj2C25TZ9PWkrDPnSzwooA6cWVZvgLB +/abnQGUTb/t9kipCYbsiM5voBntxi6Em0MGvay6gAxZDgww0XJfjOR3uphuhAv1C +P1e2+3X5z+TWdo10gkbUVGOBF3oqejrNMsrulEzX9FEgovYLa24UqVL1KiF+BrGW +aMAOuxrW7on1Hy1rPh5fCi8Rm+fpnaY5zbAE1xg9FbEpJugxDMe+/T7tz4S7t3Tr +6tDwcYGk98tbxRPYMyyCvvtO2BW1+WENySqUp++SI7lP3vsHOLeS9J/78TPzpnh9 +1d+phaI7GNxWZ0hs5drl66r1vdIIxpCnFkkyDUpZF+LNzNhKpwbsDZCEv+0H1bic +RCaY8nlPlWZP1zbgI/R6KECIPNAm9ZvpQpWgueN6TtL+rX4SkixmoB25CXJdhRbo +h9VyPeJt+rj7BTp487gawEk8hGThfb1UadqLidOwP2LqaOhBUkiMFKTL899YLg24 +TFjtK2hHUCTzy9dBQGkz +=cNPU +-END PGP SIGNATURE-
svn commit: r31832 - /dev/subversion/subversion-1.10.4.zip.asc
Author: jcorvel Date: Wed Jan 9 07:44:47 2019 New Revision: 31832 Log: Add my signature for 1.10.4 (Windows). Modified: dev/subversion/subversion-1.10.4.zip.asc Modified: dev/subversion/subversion-1.10.4.zip.asc == --- dev/subversion/subversion-1.10.4.zip.asc (original) +++ dev/subversion/subversion-1.10.4.zip.asc Wed Jan 9 07:44:47 2019 @@ -15,3 +15,20 @@ dj8Q3g83NsGGOsFC0jD3h+gw2CtPl1LXuj92PRZQ QH1vSVyS4jCXgvTrLQ3h =Z00F -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJcNT/vAAoJELWc5tYBDIqtVzoQAL7TnY6cKV8NCrslRkCZsR4f +6ZJ29iIu5rhrNU2xdWBd7rlBOe3qKnDpOp+FmWOPMG/H2fcbgAHPpMFyiduDkUND +sdDtx2RIKwIjqVhfavfg5uwUDWZuco7Doy00yBmT7dBTdi4kBMEtfg+jQSsycOgb +8rnVMqCX7AP2K8pylhGwO/wx17kIBVmjsmqZybv35mAIq9L1JUzOguSQZg/cASOZ +RyhIZut5waR/mWnOPTwup+sOdMIBEV8BOo3qQaXm2YycwuYxdo/CR18MfZ94T8X+ +1OmyCgOQpEo2bpkqwCKUsFBuJ7DKrf8UmvRKJzG8UNmuBYI8nOy3YP2w48yXApkw +TC/o3Qg5Z3LcpTa17XMNwXS3ErNdJtP/gcByRMjGAY5DFYe6DcVrNwYJaH6DDFQY +9p+HJ13jIgnYjWBy7TODaINXG+X7O8FeEfWzQcvt8UphMyJ3TzKaWeXCS/3hcEE5 +Jh5+4TbXTM/cUtv20oMjzZojabeGOSdgt3UhAqAwY9zm8ed2H6U0j3Xj98MLs8+A +Sk8bszAq6/xh0i0RX6FhkNUJWKM6u05sFsjOZEel0l/bMmppWdK5QVSCClXw/9Rt +uiD/uKpcGVNsICIMlBnDvsKcASORQU0eFaQz7bvwd/EjBnA3e60mvY7eYGnntmIp +XGQ+E06uBzttVFxUOrwp +=x9bu +-END PGP SIGNATURE-
svn commit: r31825 - /dev/subversion/subversion-1.11.1.zip.asc
Author: jcorvel Date: Wed Jan 9 00:00:53 2019 New Revision: 31825 Log: Add signature for 1.11.1 (Windows) Modified: dev/subversion/subversion-1.11.1.zip.asc Modified: dev/subversion/subversion-1.11.1.zip.asc == --- dev/subversion/subversion-1.11.1.zip.asc (original) +++ dev/subversion/subversion-1.11.1.zip.asc Wed Jan 9 00:00:53 2019 @@ -15,3 +15,20 @@ OLYOYIzdzh70+FT7T6+KDLqnNK+/pKSPU8+mKhCY DXcbyavmXVDcP4IRRh6K =uUdN -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJcNTAVAAoJELWc5tYBDIqt0uIP/0JPPCV3c5H24qNs1+zrl94G +sOCTPlr27BgNWmPJr3PAHRkpAT/3/L3XLq42yxv7iiOQAgZFY4jrZ0jAUzTE97i8 ++sk2nM2kmAC/UMpyU54dPqGM2kgVDKBjy6Ch8YlWAOK3qmIZKiyr7DHO6NvKttHK +p1+q1iR2WkGvex4HNNnzAObTt3UIXR3C++ktRyQrhw6GzXWOVwWGjdlqRuHHgVdU +L676lB6OyfpiEzTu4nW02mH5gQ93Zu1W13SaXgVXV/5LTCI4p/vUQIUdiQ65IarI +BPsIkx5z69nZ1A3Mz1LqmvRprMLfG4RxiQdoqe96kjTC087MhieL6ZKxTTneJT3+ +zDOl3rHfVX0JNV/OCBveqYRGlPnAjWlsBgCAu54rcuzzmet0tlb7tL87Tkln1BCE +e9RZllNGzwHIVlWRhPZg4Z0ZY7EH1lRN8Syq2d+x6doWXgF6qnn/VZLenow/JQi5 +l70pgxivUbXw79e09jJ0cGzlQUTfjBAN9c+3S5IiaUeatYIT6NuPt/c3aT5yKsHa +UDtl5xfJEPWjI7HzUOZ3axHNcOBFayhSgi1VMB2ugBJTtM4FsxqnoKXtv2ygXW7h +13kmMas01uXcDssq2YszoKiyijvI1MHaTbFuQAnUEP6omJMFe9wLuTrTdtReGP4U +FCTp6RwiFlWkJmHSg7Rq +=fdH2 +-END PGP SIGNATURE-
svn commit: r30504 - /dev/subversion/subversion-1.11.0.zip.asc
Author: jcorvel Date: Mon Oct 29 22:21:00 2018 New Revision: 30504 Log: Add my signature for 1.11.0 (Windows). Modified: dev/subversion/subversion-1.11.0.zip.asc Modified: dev/subversion/subversion-1.11.0.zip.asc == --- dev/subversion/subversion-1.11.0.zip.asc (original) +++ dev/subversion/subversion-1.11.0.zip.asc Mon Oct 29 22:21:00 2018 @@ -15,3 +15,20 @@ C+dUGify60cB+kqRxbjs82v7D13sv1NLURqZc/Yq wrdGG2znkJ6y/s+o9d+z =AOea -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJb14QnAAoJELWc5tYBDIqtFr4QAI7iMyM9ZQcBWDsniV/akLH1 +7icydVoxHigqtC2VXW0Za+ngEqdO/SXbl+qvYgv1GGdNXsncT0+gyR7nGkXpSWlT +jTeahiNvGYqtHl0LR3LaRdHTKg8Fa1E5BesIBD5KiasZkkzZoz4YAQhZiPJnFJqM +I49tKi3mGG4Bwgm/mRwVQE7EwW4HWkizJCrC+ZIlWO8iSQ+Jalg3CFK3JfXg2ZTY +PiiCgFxbUBxAYT4Ux61KbBiyMFF7EpQJ3jmVNGSlOWiFbrZcsTzPtWtItHqR7O41 +4S7aiylniOob+iq5CpBirTMbpT+/vAw3gyBKyo2aN8NNC7nXb6JVAEesmjHlTFNC +Z0Pm/v+QaKu5Vw8UkKSLqp7HM8jRu53NBpb+TQDGxLgfw4XuiYjgSHAeOxH0glj1 +WcQZcSE898CaBiJU4m96MsFJtzFst+/CDKZ6cP/h9VsDyA+pAdZ7kY1CAp5ON0Vr +ZjpOWB4iYc4BejxyZzGffJGk71Md6lCkhp1Txs8kXN9vWdOtag5U1vAze1TjsBC8 +kU9+1UHhu6dM/BJ0NrcsSgQOFyWZzMsaABT4vJ/XtDpedAuDoc2t2UTZIlWaHr2P +PpCAXGaeHN0lsbOTb10+anXryFqU1g6zNPnk9g/Bq0AoscGzPAYBTbTdg95P3Snf +eMSf/a/wimbTSlgHkw3R +=dI1q +-END PGP SIGNATURE-
svn commit: r29929 - /dev/subversion/subversion-1.10.3.zip.asc
Author: jcorvel Date: Sun Oct 7 22:09:51 2018 New Revision: 29929 Log: Add my signature for 1.10.3 (Windows). Modified: dev/subversion/subversion-1.10.3.zip.asc Modified: dev/subversion/subversion-1.10.3.zip.asc == --- dev/subversion/subversion-1.10.3.zip.asc (original) +++ dev/subversion/subversion-1.10.3.zip.asc Sun Oct 7 22:09:51 2018 @@ -15,3 +15,20 @@ NUUujIYwkDxsoOLQavdzyadKpdIur9vpRUGUdw6E CXFFzFryCk8q9h2kmVru =7STa -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbuoO/AAoJELWc5tYBDIqtcSkP/144f6KyEINGHVJbl0vo0m8f +uarsQwgrXA0JTEnFBNIPA/GlogjJYKAHjalxIlTG+Cc2fwuwFsym2yOqVT1oS0bz +8yqkTpz5f6L6hfuCgtDr7eNkKwtKsPL211X8+H1fb3s6PZbwt0uCyXk1qULgZO8p +MMEDCi8YdcTS6qlk1IXmlhK9AQ0FwPlz4ujT5uqYbHE+LtmgT65QpA3eH0CGDh2U +pYl7U6Pld6hWXNs3WSwrHyH5UL3Xa+tB6OJLUurg32quu4Qr8ivMAYDS976rA8Oh +hTco6qhc0yfsxbAMmLr5kNhNymuTQJZ9MlAqUlzfPjwTzgLUrX0Eznx0hfPwWH+Z +EV3+F4nX+ow04whYgKSjixY8UQqDnjdxSq3HY77pwIziIVlmdNKrI7HZEKlmCde7 +MCEuJ3z8nZNz8FLLZ7I6XGwT84pBIxLMFxX2s37xOvO1UhiQzDmTORTGN3IxixVW +TaRSZbNfFaSHBlh6tMxOwezg/hZcxgsFbTUYz95AcQ3ikKeyWlWqp8tprd5yVDlM +AUgch9l424Aeu4fq7G4FGyCT7qj0ugH9+iMuPDHK6Z7b9MMXxJKqs+fEFj6I6ngt +cVpd2i0wvq5MnoS7kZD9az60Skynv3SOu/KCX60SnJBLHswgBykuuHHeDHF7sP7G +wMC3BbT6L40T0gOr2wk1 +=0aF8 +-END PGP SIGNATURE-
svn commit: r1842665 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Tue Oct 2 22:36:16 2018 New Revision: 1842665 URL: http://svn.apache.org/viewvc?rev=1842665&view=rev Log: * 1.10.x/STATUS: Vote for r1839739. 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=1842665&r1=1842664&r2=1842665&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Oct 2 22:36:16 2018 @@ -23,7 +23,7 @@ Candidate changes: Notes: This was a separate followup on changes that were already backported. Votes: - +1: rhuijben, brane + +1: rhuijben, brane, jcorvel +0: danielsh Veto-blocked changes:
svn commit: r1842571 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Mon Oct 1 22:41:42 2018 New Revision: 1842571 URL: http://svn.apache.org/viewvc?rev=1842571&view=rev Log: * 1.10.x/STATUS: Vote for r1836960 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=1842571&r1=1842570&r2=1842571&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Mon Oct 1 22:41:42 2018 @@ -15,17 +15,6 @@ Status of 1.10.3: Candidate changes: == - * r1836960, r1836968 - Fix issue #4766, "resolver adds unrelated moves to move target list" - Justification: - Undesirable resolver behaviour: If an item was moved, all other items - moved within the same revision will be considered viable merge targets. - Notes: - r1836960 adds a regression test - r1836968 fixes the bug - Votes: - +1: stsp, rhuijben - Veto-blocked changes: = @@ -98,3 +87,14 @@ Approved changes: User complained: https://svn.haxx.se/users/archive-2018-10/0003.shtml Votes: +1: stsp, julianfoad, jcorvel + + * r1836960, r1836968 + Fix issue #4766, "resolver adds unrelated moves to move target list" + Justification: + Undesirable resolver behaviour: If an item was moved, all other items + moved within the same revision will be considered viable merge targets. + Notes: + r1836960 adds a regression test + r1836968 fixes the bug + Votes: + +1: stsp, rhuijben, jcorvel
svn commit: r1842570 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Mon Oct 1 22:04:06 2018 New Revision: 1842570 URL: http://svn.apache.org/viewvc?rev=1842570&view=rev Log: * 1.10.x/STATUS: Vote for r1839662, 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=1842570&r1=1842569&r2=1842570&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Mon Oct 1 22:04:06 2018 @@ -26,15 +26,6 @@ Candidate changes: Votes: +1: stsp, rhuijben - * r1839662 - For 'local missing' conflicts, scan for moves only if a YCA is known. - Justification: - Prevents long-runing history scan which serves no useful purpose. - User complained: https://svn.haxx.se/users/archive-2018-08/0038.shtml - User complained: https://svn.haxx.se/users/archive-2018-10/0003.shtml - Votes: - +1: stsp, julianfoad - Veto-blocked changes: = @@ -99,3 +90,11 @@ Approved changes: +1: julianfoad, rhuijben +1: danielsh (would prefer read_rep_cache() to check format numbers; see the "r1838813" thread on dev@) (without r1839703, r1839734) + * r1839662 + For 'local missing' conflicts, scan for moves only if a YCA is known. + Justification: + Prevents long-runing history scan which serves no useful purpose. + User complained: https://svn.haxx.se/users/archive-2018-08/0038.shtml + User complained: https://svn.haxx.se/users/archive-2018-10/0003.shtml + Votes: + +1: stsp, julianfoad, jcorvel
svn commit: r29808 - /dev/subversion/subversion-1.11.0-rc2.zip.asc
Author: jcorvel Date: Mon Oct 1 06:19:49 2018 New Revision: 29808 Log: Add my signature for 1.11.0-rc2 (Windows). Modified: dev/subversion/subversion-1.11.0-rc2.zip.asc Modified: dev/subversion/subversion-1.11.0-rc2.zip.asc == --- dev/subversion/subversion-1.11.0-rc2.zip.asc (original) +++ dev/subversion/subversion-1.11.0-rc2.zip.asc Mon Oct 1 06:19:49 2018 @@ -15,3 +15,20 @@ UHJZ1hNDZo96cSkw6PjqsSysiEWd82qqTMpMTjMO 49dUQMTg6jCvco9Wavq1 =HOFJ -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbsVzyAAoJELWc5tYBDIqtMFYQAKQW20He01C/gRcd4O/frYWi +CatqYQnyzYiSuIi854RN3HYV9Cot+GXdyBvfAgHbtwmJZLfm4PwDaVMyfxG/GLmY +iqfUZlwNjzbwYkVvgr2Smv93a1/DluES8cu0Ya+UPWW7ixBojQFBsO40kDcRBOsV +9KDzTqQ3Wo4oqMhRbYw8eCuebD9iwogki7Ldso9j5A7TV/YNJgeEdP/nzSoKFI55 +e29UqRQE/eYmZQy8csuJWdHbBIVLrYAV2OCkzoyIfr2Ja2Pm0zWlX1Q3VpLQGht5 +z4xQ3JSPmRcnCxSt5Zoh7SNyoueqdGW3ZASrUUWDdWVozqd4fuxMbKpxK4CZP7kH +o37GjtJaGkYSjLq21Jr89BBSTyHjCErA2Ato3dtqhk1+e+YD5mfsWsOHH3W+eg98 +x8bggR0Jy5EDpvcCchgcutbUTpky50ycXBcc02pxqUKUb+towEVrXoK0AIdjJK93 +bWOedtQYXgKy3PqhNMdoYgnZeiPjm+IGxokx3GIRLZqXeq8sDZYm2oajQQEz7m8P +NaqnQsWj26EMZb30LokdfLYC4pIQDvg3YjUtGCWurblSzwLqFJm4Y283pb+FqWmw +n3zbzpdDuCQKEjPMmSOZoKnJ4x8hy9N/15D6x99zKXGMdu1F5MTCxHyOze5Xwcoz +vAtm60LeIRrB74tzluRj +=o0XM +-END PGP SIGNATURE-
svn commit: r1841896 - /subversion/branches/1.11.x/STATUS
Author: jcorvel Date: Mon Sep 24 21:53:14 2018 New Revision: 1841896 URL: http://svn.apache.org/viewvc?rev=1841896&view=rev Log: * 1.11.x/STATUS: Upgrade vote for r1841725 group, approving. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841896&r1=1841895&r2=1841896&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Mon Sep 24 21:53:14 2018 @@ -15,17 +15,17 @@ Status of 1.11.0: Candidate changes: == +Veto-blocked changes: += + +Approved changes: += + * r1841725, r1841850 Use an iterpool during interactive conflict resolution. Justification: Reduces the chance of resource exhaustion in case the resolver goes into an endless loop due to a bug (see r1841731 for an example). Votes: - +1: stsp, jcorvel (without r1841850) - +1: rhuijben, julianfoad - -Veto-blocked changes: -= - -Approved changes: -= + +1: stsp (without r1841850) + +1: rhuijben, julianfoad, jcorvel
svn commit: r1841849 - /subversion/branches/1.11.x/STATUS
Author: jcorvel Date: Mon Sep 24 13:52:57 2018 New Revision: 1841849 URL: http://svn.apache.org/viewvc?rev=1841849&view=rev Log: * 1.11.x/STATUS: Vote for r1841822, approving. Modified: subversion/branches/1.11.x/STATUS Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841849&r1=1841848&r2=1841849&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Mon Sep 24 13:52:57 2018 @@ -48,14 +48,6 @@ Candidate changes: Votes: +1: stsp, jcorvel - * r1841822 - Shelving: update the command-line help about the storage directory and say - how to recover a 1.10 shelf. - Justification: - Support transitioning from 1.10 to 1.11 experimental shelving. - Votes: - +1: julianfoad, brane - Veto-blocked changes: = @@ -72,3 +64,11 @@ Approved changes: r1841743 is a follow-up fix for the follow-up fix :) Votes: +1: stsp, jcorvel, brane + + * r1841822 + Shelving: update the command-line help about the storage directory and say + how to recover a 1.10 shelf. + Justification: + Support transitioning from 1.10 to 1.11 experimental shelving. + Votes: + +1: julianfoad, brane, jcorvel
svn commit: r1841797 - /subversion/branches/1.11.x/STATUS
Author: jcorvel Date: Mon Sep 24 05:54:36 2018 New Revision: 1841797 URL: http://svn.apache.org/viewvc?rev=1841797&view=rev Log: * 1.11.x/STATUS: Vote for the conflict resolver backports. 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=1841797&r1=1841796&r2=1841797&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Mon Sep 24 05:54:36 2018 @@ -39,7 +39,7 @@ Candidate changes: Reduces the chance of resource exhaustion in case the resolver goes into an endless loop due to a bug (see r1841731 for an example). Votes: - +1: stsp + +1: stsp, jcorvel * r1841731, r1841736, r1841743 Fix endless loop in the conflict resolver. @@ -50,21 +50,21 @@ Candidate changes: r1841736 is a follow-up fix to make the test pass on Windows r1841743 is a follow-up fix for the follow-up fix :) Votes: - +1: stsp + +1: stsp, jcorvel * r1841719, r1841742 Add support for 'local missing' conflicts with directories. Justification: This case already works with files. Now also works with directories. Votes: - +1: stsp + +1: stsp, jcorvel * r1841753, r1841754 Fix an assertion failure in the conflict resolver. Justification: Assertions should not get triggered by particular tree conflicts. Votes: - +1: stsp + +1: stsp, jcorvel Veto-blocked changes: =
svn commit: r1841711 - /subversion/branches/1.11.x/STATUS
Author: jcorvel Date: Sun Sep 23 00:24:11 2018 New Revision: 1841711 URL: http://svn.apache.org/viewvc?rev=1841711&view=rev Log: * 1.11.x/STATUS: Vote for the r1840990 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=1841711&r1=1841710&r2=1841711&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Sun Sep 23 00:24:11 2018 @@ -15,21 +15,6 @@ Status of 1.11.0: Candidate changes: == - * r1840990, r1840991, r1840995, r1840997 - Various conflict resolver improvements. - Notes: - I am proposing these in a batch because merging them out of order would - result in conflicts, and because I was planning to make these changes - before 1.11 was branched in the first place but didn't get around to it. - - r1840990 is a cosmetic output change - - r1840991 prevents an out-of-bounds array access - - r1840995 implements support for ambiguous moves in 'local missing' cases - - r1840997 improves resolver API semantics - Ideally, these should be merged before 1.11.0 is released. - Votes: - +0: julianfoad (only r1840990,r1840991) - +1: stsp, brane - * r1841079,r1841481,r1841567 Move all experimental APIs to the private namespace. Justification: @@ -70,3 +55,18 @@ Approved changes: than the java bindings; this counts as three +1s for the build system changes) + * r1840990, r1840991, r1840995, r1840997 + Various conflict resolver improvements. + Notes: + I am proposing these in a batch because merging them out of order would + result in conflicts, and because I was planning to make these changes + before 1.11 was branched in the first place but didn't get around to it. + - r1840990 is a cosmetic output change + - r1840991 prevents an out-of-bounds array access + - r1840995 implements support for ambiguous moves in 'local missing' cases + - r1840997 improves resolver API semantics + Ideally, these should be merged before 1.11.0 is released. + Votes: + +0: julianfoad (only r1840990,r1840991) + +1: stsp, brane, jcorvel +
svn propchange: r1840997 - svn:log
Author: jcorvel Revision: 1840997 Modified property: svn:log Modified: svn:log at Sat Sep 22 22:06:14 2018 -- --- svn:log (original) +++ svn:log Sat Sep 22 22:06:14 2018 @@ -23,24 +23,24 @@ change will be backported to the recentl * subversion/include/svn_client.h (svn_client_conflict_option_get_moved_to_repos_relpath_candidates2, - (svn_client_conflict_option_set_moved_to_repos_relpath): New. + svn_client_conflict_option_set_moved_to_repos_relpath2): New. (svn_client_conflict_option_get_moved_to_repos_relpath_candidates, - (svn_client_conflict_option_set_moved_to_repos_relpath): Deprecate. + svn_client_conflict_option_set_moved_to_repos_relpath): Deprecate. (svn_client_conflict_option_get_moved_to_abspath_candidates2, - (svn_client_conflict_option_set_moved_to_abspath): New. + svn_client_conflict_option_set_moved_to_abspath2): New. (svn_client_conflict_option_get_moved_to_abspath_candidates, - (svn_client_conflict_option_set_moved_to_abspath): Deprecate. + svn_client_conflict_option_set_moved_to_abspath): Deprecate. * subversion/libsvn_client/conflicts.c + (svn_client_conflict_option_get_moved_to_repos_relpath_candidates2, + svn_client_conflict_option_set_moved_to_repos_relpath2): New. (svn_client_conflict_option_get_moved_to_repos_relpath_candidates, - (svn_client_conflict_option_set_moved_to_repos_relpath): New. - (svn_client_conflict_option_get_moved_to_repos_relpath_candidates, - (svn_client_conflict_option_set_moved_to_repos_relpath): Implement + svn_client_conflict_option_set_moved_to_repos_relpath): Implement as a wrapper around the new API. (svn_client_conflict_option_get_moved_to_abspath_candidates2, - (svn_client_conflict_option_set_moved_to_abspath): New. + svn_client_conflict_option_set_moved_to_abspath2): New. (svn_client_conflict_option_get_moved_to_abspath_candidates, - (svn_client_conflict_option_set_moved_to_abspath): Implement as a + svn_client_conflict_option_set_moved_to_abspath): Implement as a wrapper around the new API. * subversion/svn/conflict-callbacks.c
svn commit: r1841526 - /subversion/branches/1.11.x/STATUS
Author: jcorvel Date: Fri Sep 21 00:57:37 2018 New Revision: 1841526 URL: http://svn.apache.org/viewvc?rev=1841526&view=rev Log: * STATUS: Add r1841524, r1841525 (Fix detection of JDK 10 on Windows when --with-jdk is used) to the java10 nomination, and vote for it. 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=1841526&r1=1841525&r2=1841526&view=diff == --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Fri Sep 21 00:57:37 2018 @@ -44,13 +44,14 @@ Candidate changes: Votes: +1: julianfoad, jamessan - * r1841180 + * 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: jamessan + +1 (without r1841524, r1841525): jamessan + +1: jcorvel Veto-blocked changes: =
svn commit: r1841525 - /subversion/trunk/build/generator/gen_win_dependencies.py
Author: jcorvel Date: Fri Sep 21 00:51:04 2018 New Revision: 1841525 URL: http://svn.apache.org/viewvc?rev=1841525&view=rev Log: * build/generator/gen_win_dependencies.py (_find_jdk): Fix indentation of comments (tabs -> spaces). Modified: subversion/trunk/build/generator/gen_win_dependencies.py Modified: subversion/trunk/build/generator/gen_win_dependencies.py URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1841525&r1=1841524&r2=1841525&view=diff == --- subversion/trunk/build/generator/gen_win_dependencies.py (original) +++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Sep 21 00:51:04 2018 @@ -1067,9 +1067,9 @@ class GenDependenciesBase(gen_base.Gener return try: - # Apparently a 1.8 javac writes its version output to stderr, while - # a 1.10 javac writes it to stdout. To catch them all, we redirect - # stderr to stdout. + # Apparently a 1.8 javac writes its version output to stderr, while + # a 1.10 javac writes it to stdout. To catch them all, we redirect + # stderr to stdout. outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javac.exe'), '-version'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout
svn commit: r1841524 - /subversion/trunk/build/generator/gen_win_dependencies.py
Author: jcorvel Date: Fri Sep 21 00:48:23 2018 New Revision: 1841524 URL: http://svn.apache.org/viewvc?rev=1841524&view=rev Log: Fix detection of JDK 10 on Windows when --with-jdk is used. * build/generator/gen_win_dependencies.py (_find_jdk): Use javac.exe instead of javah.exe for validating the --with-jdk option. Drop the quotes from the vermatch regex, because with javac the version number is not quoted. Modified: subversion/trunk/build/generator/gen_win_dependencies.py Modified: subversion/trunk/build/generator/gen_win_dependencies.py URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1841524&r1=1841523&r2=1841524&view=diff == --- subversion/trunk/build/generator/gen_win_dependencies.py (original) +++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Sep 21 00:48:23 2018 @@ -1067,11 +1067,15 @@ class GenDependenciesBase(gen_base.Gener return try: - outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javah.exe'), - '-version'], stdout=subprocess.PIPE).stdout + # Apparently a 1.8 javac writes its version output to stderr, while + # a 1.10 javac writes it to stdout. To catch them all, we redirect + # stderr to stdout. + outfp = subprocess.Popen([os.path.join(jdk_path, 'bin', 'javac.exe'), + '-version'], stdout=subprocess.PIPE, + stderr=subprocess.STDOUT).stdout line = outfp.read() if line: -vermatch = re.search(r'"(([0-9]+(\.[0-9]+)+)(_[._0-9]+)?)"', line, re.M) +vermatch = re.search(r'(([0-9]+(\.[0-9]+)+)(_[._0-9]+)?)', line, re.M) else: vermatch = None
svn commit: r28156 - /dev/subversion/subversion-1.10.2.zip.asc
Author: jcorvel Date: Mon Jul 16 20:12:05 2018 New Revision: 28156 Log: Add my signature for 1.10.2 (Windows). Modified: dev/subversion/subversion-1.10.2.zip.asc Modified: dev/subversion/subversion-1.10.2.zip.asc == --- dev/subversion/subversion-1.10.2.zip.asc (original) +++ dev/subversion/subversion-1.10.2.zip.asc Mon Jul 16 20:12:05 2018 @@ -15,3 +15,20 @@ ux4I9xfo5NAwXQDnAqCtNO4UbLaPJAvuN0Sg48u3 VSPY9B9iHMafurPRNuRJ =M2e6 -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbS8RiAAoJELWc5tYBDIqtHo4P/jCM3DfN1PS83EmYjo0eLlKC +nsEVTPRge+Rxh7VzEkU2WjHAJ/EwEyhLWsg1wia4mnNbRLg4NanGL4x8lx5lYkTe +AbdCXrOEADJ9HMAIhnE55pd7IpFKdYGC0WBQNaaoGQm+yYw0jToHs2hprdryIpCN +HLl8CQZUjV9/NBSSvdW11nV8Woz57Iwz847ECHB143xyNErS1gh2chZP9XFPK+KZ +Y1LfWmEt87RHzRKO7B2LJvTFIQh7a6s9RC4H4/Gwl1g37sLV9zolqVar3kGq+sJY +WsSAc/Cm15mFyUaL3YN3qPxaXRPHTtzm7g4YhZ1zBtmLhj2FUbrQG/Mh4tywtQyZ +jgHD1u+mar9mJYvtjudXSlJ8wLYi3wwk3EpPAUXnyaxTOianHM0XTmLLOtQKm81k +2NxHRRARiG2dBGEWRr7NUulPmKT6K4mdRu2ouyIbOm2OBlfXUh1k/xrJyBNV6ZeC +wElVapG1+GpfXU93/lt/Qc2xtoh6axP5AyyBDLVHR7Eze8+SKqFJfSMdohdYLHMt +mP+DBVUOf6F1sser53L/5i8V6nYqBs+ODm8ZHhHP5lcBgiID3IP/fkylMEKZtEbt +2MPgaEhgPlxTH78encjjb+YGG2CFmkNY1paHxVbtaVeAgv+7K33YmGFkbwYGcAIQ +yOkSqq+zrB7BooEPBmd4 +=PTMU +-END PGP SIGNATURE-
svn commit: r28154 - /dev/subversion/subversion-1.9.9.zip.asc
Author: jcorvel Date: Mon Jul 16 18:36:37 2018 New Revision: 28154 Log: Add my signature for 1.9.9 (Windows) Modified: dev/subversion/subversion-1.9.9.zip.asc Modified: dev/subversion/subversion-1.9.9.zip.asc == --- dev/subversion/subversion-1.9.9.zip.asc (original) +++ dev/subversion/subversion-1.9.9.zip.asc Mon Jul 16 18:36:37 2018 @@ -15,3 +15,20 @@ NugVyY2o7P7mWXghU3Xr8CCi+3AAnLLanYfTJIGm SEpMy8g/MX6SxYQg+efM =oswl -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJbS8jFAAoJELWc5tYBDIqt0aEP+wWGlqZ1jewaUWnaMG63BNXY +cD7GtejmCxJN+HBl8673AC9FFpsvLnw8VQ/5iSed1Qb1xqZVpE6m6siFEPPDlL8H ++8kHQG+8pb95cR7pyn7krFheOr0ev7YUHVJ3pVG2PFW355XZ5bVju7BYI73eu57R +PtP+lfLog1iYenSAKk+GsUU0MCxpdfBdIs/gByWejohXDVRCbKEsVGd5n762CHJB +nG0uEsnE72XCfRCFKy2QcnwpTMSrTEYb7twbxoMSoVgarL7DOUr5BO4TXOisntVA +AfPdx/BxpXwBvnhDrAWfBx8Sm3KUwhbUEC8EjbFuPTJHfQpbi0CYPuh3WUsfnkKf +vdFMnKsb92FxP3zSOjovCeJFDuLDhGTF4D067JI8905Hl5T4mGVM0gGvonkoeLEI +JfiBXuEp8BtiLSGoDqZ0FNEwrN9nNfntFOLdmruqA5hG86nbIqGlP7BXbLRTyCF/ +m69T600FclXAgwxyScTIu3yPcE//5xC8M3HDjsIr+199TUw1cLhOxAw7UvQvf7s3 +Bq5UKqNZPprl/HlekMO+lSwvlfHKmTjQzy5ZFwxS9dYY8KHj3FiWltKmbYYp8z82 +uumeRFTpZ7htXmWp3kcBOECMwQ2pKWKvACMVcpcHOx8SR8ZCWW5gsmiihyX75wjv +YZrbPCh5HWpQqa9hmQbE +=j4zG +-END PGP SIGNATURE-
svn commit: r1835698 - /subversion/branches/1.9.x/STATUS
Author: jcorvel
Date: Thu Jul 12 02:36:24 2018
New Revision: 1835698
URL: http://svn.apache.org/viewvc?rev=1835698&view=rev
Log:
* 1.9.x/STATUS: Vote for r1830883 group (externals pruning). Vote for
r1811189 (rewording block warning), approving.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1835698&r1=1835697&r2=1835698&view=diff
==
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Jul 12 02:36:24 2018
@@ -64,16 +64,6 @@ Candidate changes:
Votes:
+1: brane
- * r1811189
- Reword warning message to avoid confusion: the word "nested" was interpreted
- as nested blocks in httpd.conf syntax.
- Thread:
-
https://mail-archives.apache.org/mod_mbox/subversion-users/201710.mbox/%3C34a3a22e-cff1-1958-a109-35c6f925ae84%40cardiov.ox.ac.uk%3E
- Justification:
- Prevent user confusion.
- Votes:
- +1: danielsh, stsp
-
* r1813771, r1813783, r1813789, r1813794, r1813802, r1813898
Issue #4700: null updates don't update last-changed-revision.
Justification:
@@ -117,7 +107,7 @@ Candidate changes:
Current behaviour is inconsistent: Setting depth to 'empty' prunes
externals while excluding a subtree does not.
Votes:
- +1: stsp
+ +1: stsp, jcorvel
* r1833465
Enforce the v1 HTTP protocol when a client sends PUT before CHECKOUT.
@@ -148,3 +138,13 @@ Veto-blocked changes:
Approved changes:
=
+
+ * r1811189
+ Reword warning message to avoid confusion: the word "nested" was interpreted
+ as nested blocks in httpd.conf syntax.
+ Thread:
+
https://mail-archives.apache.org/mod_mbox/subversion-users/201710.mbox/%3C34a3a22e-cff1-1958-a109-35c6f925ae84%40cardiov.ox.ac.uk%3E
+ Justification:
+ Prevent user confusion.
+ Votes:
+ +1: danielsh, stsp, jcorvel
svn commit: r1835694 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Thu Jul 12 02:07:44 2018 New Revision: 1835694 URL: http://svn.apache.org/viewvc?rev=1835694&view=rev Log: * STATUS: Vote for conflict resolver fixes: r1830083 (issue #4739) and r1833895 (issue #4744) groups. 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=1835694&r1=1835693&r2=1835694&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jul 12 02:07:44 2018 @@ -34,7 +34,7 @@ Candidate changes: r1833866 is a small follow-up fix Issue #4744 fix should be merged after this to avoid merge conflicts. Votes: - +1: stsp + +1: stsp, jcorvel * r1833895, r1833897, r1833899, r1833901 Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)" @@ -47,7 +47,7 @@ Candidate changes: r1833901 prevents the assertion failure and adjusts the test Issue #4739 fix should be merged before this to avoid merge conflicts. Votes: -+1: stsp ++1: stsp, jcorvel * r1833465 Enforce the v1 HTTP protocol when a client sends PUT before CHECKOUT.
svn commit: r1835693 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Thu Jul 12 01:18:28 2018 New Revision: 1835693 URL: http://svn.apache.org/viewvc?rev=1835693&view=rev Log: * STATUS: Vote for r1833836 group (conflict resolver search limit), 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=1835693&r1=1835692&r2=1835693&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jul 12 01:18:28 2018 @@ -23,19 +23,6 @@ Candidate changes: Votes: +1: jorton, stsp - * r1833836, r1833842 - Fix issue #4740, "conflict resolver searches too far back ..." - Justification: - The current behaviour is hard-coded to traverse all of history in - a "local missing vs incoming edit" situation. This is impractical - on repositories with a large number of revisions. - Easy fix which just runs an already existing YCA search a bit - earlier, falling back to full traversal if no YCA can be found. - User complained and provided a reproduction script: - https://svn.haxx.se/users/archive-2018-04/0060.shtml - Votes: - +1: stsp, philip - * r1830083, r1833864, r1833866 Fix issue #4739, "Accept incoming deletion" option doing nothing for a locally deleted file @@ -99,3 +86,16 @@ Approved changes: Votes: +1: stsp, philip, jcorvel +0: rhuijben (in concept, not reviewed) + + * r1833836, r1833842 + Fix issue #4740, "conflict resolver searches too far back ..." + Justification: + The current behaviour is hard-coded to traverse all of history in + a "local missing vs incoming edit" situation. This is impractical + on repositories with a large number of revisions. + Easy fix which just runs an already existing YCA search a bit + earlier, falling back to full traversal if no YCA can be found. + User complained and provided a reproduction script: + https://svn.haxx.se/users/archive-2018-04/0060.shtml + Votes: + +1: stsp, philip, jcorvel
svn commit: r1835691 - /subversion/branches/1.10.x/STATUS
Author: jcorvel
Date: Thu Jul 12 00:43:12 2018
New Revision: 1835691
URL: http://svn.apache.org/viewvc?rev=1835691&view=rev
Log:
* STATUS: Vote for r1830883 group (externals pruning), 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=1835691&r1=1835690&r2=1835691&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jul 12 00:43:12 2018
@@ -15,15 +15,6 @@ Status of 1.10.1:
Candidate changes:
==
- * r1830883,r1830900,r1830901
- Prune externals from excluded subtrees after 'update --set-depth=exclude'
- Justification:
- Current behaviour is inconsistent: Setting depth to 'empty' prunes
- externals while excluding a subtree does not.
- Votes:
- +1: stsp, philip
- +0: rhuijben (in concept, not reviewed)
-
* r1830882
Fix libsvn_auth_gnome_keyring.pc when built using libsecret.
Justification:
@@ -99,3 +90,12 @@ Approved changes:
Without this, shell extensions like TSVN fail with files in OneDrive on
Windows.
Votes:
+1: steveking, stsp, jcorvel
+
+ * r1830883,r1830900,r1830901
+ Prune externals from excluded subtrees after 'update --set-depth=exclude'
+ Justification:
+ Current behaviour is inconsistent: Setting depth to 'empty' prunes
+ externals while excluding a subtree does not.
+ Votes:
+ +1: stsp, philip, jcorvel
+ +0: rhuijben (in concept, not reviewed)
svn commit: r1835690 - /subversion/branches/1.10.x/STATUS
Author: jcorvel Date: Thu Jul 12 00:20:07 2018 New Revision: 1835690 URL: http://svn.apache.org/viewvc?rev=1835690&view=rev Log: * STATUS: Vote for r1833621, 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=1835690&r1=1835689&r2=1835690&view=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jul 12 00:20:07 2018 @@ -15,13 +15,6 @@ Status of 1.10.1: Candidate changes: == - * r1833621 - Since on Windows Subversion does not handle symlinks, never check for reparse points. - Justification: - Without this, shell extensions like TSVN fail with files in OneDrive on Windows. - Votes: - +1: steveking, stsp - * r1830883,r1830900,r1830901 Prune externals from excluded subtrees after 'update --set-depth=exclude' Justification: @@ -99,3 +92,10 @@ Veto-blocked changes: Approved changes: = + + * r1833621 + Since on Windows Subversion does not handle symlinks, never check for reparse points. + Justification: + Without this, shell extensions like TSVN fail with files in OneDrive on Windows. + Votes: + +1: steveking, stsp, jcorvel
svn commit: r1829802 - /subversion/site/publish/faq.html
Author: jcorvel Date: Sun Apr 22 22:20:45 2018 New Revision: 1829802 URL: http://svn.apache.org/viewvc?rev=1829802&view=rev Log: * site/publish/faq.html (portability): Replace "Win32" by "Windows", which seems more appropriate here. Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1829802&r1=1829801&r2=1829802&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Sun Apr 22 22:20:45 2018 @@ -381,7 +381,7 @@ Community Guide. title="Link to this section">¶ -All modern flavors of Unix, Win32, BeOS, OS/2, macOS. +All modern flavors of Unix, Windows, BeOS, OS/2, macOS. Subversion is written in ANSI C and uses APR, the https://apr.apache.org/";>Apache Portable Runtime library, as a
svn commit: r1829801 - /subversion/site/publish/faq.html
Author: jcorvel Date: Sun Apr 22 22:17:42 2018 New Revision: 1829801 URL: http://svn.apache.org/viewvc?rev=1829801&view=rev Log: * site/publish/faq.html (portability): Replace "MacOS X" by "macOS". Suggested by: Ryan Schmidt Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1829801&r1=1829800&r2=1829801&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Sun Apr 22 22:17:42 2018 @@ -381,7 +381,7 @@ Community Guide. title="Link to this section">¶ -All modern flavors of Unix, Win32, BeOS, OS/2, MacOS X. +All modern flavors of Unix, Win32, BeOS, OS/2, macOS. Subversion is written in ANSI C and uses APR, the https://apr.apache.org/";>Apache Portable Runtime library, as a
svn commit: r26298 - /dev/subversion/subversion-1.10.0.zip.asc
Author: jcorvel Date: Thu Apr 12 00:34:17 2018 New Revision: 26298 Log: Add my signature for subversion-1.10.0 (Windows). Modified: dev/subversion/subversion-1.10.0.zip.asc Modified: dev/subversion/subversion-1.10.0.zip.asc == --- dev/subversion/subversion-1.10.0.zip.asc (original) +++ dev/subversion/subversion-1.10.0.zip.asc Thu Apr 12 00:34:17 2018 @@ -58,3 +58,20 @@ Y0/s3pq46knIlC9CbS+fqf27IPsPOFJ9lQ6w8nsX wNoay1+Gu90uNiDXFvmRqZoiebSIyQ== =oiQZ -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJazqflAAoJELWc5tYBDIqtvpkQAIjCsi8XZ8c7q0qzw2Dq1Til +UHgP/TVwm50EaQhZ2XQKvoLHLp7uIWZ3m5pamVrs8YH2FXkyquYLk7OQgh/f4iNI +weeTh1octhhFHhKQHe3lsOThSNbH991ujAYYJkROOWEQq/+o8w7RNUhki8T9P/7v +KbQVXXpeolNQmo4nCe/DDXSa+9pZWxuHPgWSHmXo/wvyCz8deuh3f7OO/upN4+KO +DMq8YezTlGjR9hu0mO4wge9G/lZezjr83Pn1KBsPn9cF/s/7fZzFf3knnVdwOTwl +DoMfRF1ZkY/7o/arn37cajFt3+T/s79Fr2QgOAAqPi9BzOZFZHJzUHMufc0iMaUh +2WLfWg/p7DrkReBt99i/9fHOLoj1V+IGq5FISC6Nwi20gCpHuRbgyhIwlTiajSZL +rFyfE+BTIrgbfcNpigfh92vmkROY2nxea1SEYkhf+iV1yIwkANeIRd1281DWv0W4 +KtXzDMoEvhY+Qw8vJ9yIyS2CpSB6FVS6Oq9useeREwYk94cUfg+vxawDw1odna7k +n6/AO4lQC13KjfOpDbYgtbAQTp6hD2msLXQCpQJfQ2ElGG49PwilHSsPPKKJ8fG8 +4Q2uOT5rZz9iVEz+iCKAk+g9fMAYcfbftgZ2uXc0mHGVdQEy/80akrEGOuu78TwS +TKvnKBcz6730bJ5GPnx1 +=N4Jp +-END PGP SIGNATURE-
svn commit: r26075 - /dev/subversion/subversion-1.10.0-rc2.zip.asc
Author: jcorvel Date: Sun Apr 1 08:24:16 2018 New Revision: 26075 Log: Add my signature for 1.10.0-rc2 (Windows). Modified: dev/subversion/subversion-1.10.0-rc2.zip.asc Modified: dev/subversion/subversion-1.10.0-rc2.zip.asc == --- dev/subversion/subversion-1.10.0-rc2.zip.asc (original) +++ dev/subversion/subversion-1.10.0-rc2.zip.asc Sun Apr 1 08:24:16 2018 @@ -15,3 +15,20 @@ iaizWOZaOtx0UWcR00x+PHEOINIuRrkSdJFaW/+L bScWr8x16k9DA5w+JHLU =I9bw -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJawBP1AAoJELWc5tYBDIqtxkkQAL4NM0dfSQ7FWN0ufhHYgUYj +5lsYYUwp86+i0sbjKVrpXJ5FoYuCnKCD2ihGtEWfBqXb+gzo4DH1dXc185DRH8qb +O9dONHC1uKARILx+scVMthprvoq5wKFGYY1uxLQWbRdp5dYSL6Uopd+h8BNYcYvj +P9isiryHXZSczoocosT2bNKqIEuNQ33aD4i7VeLw8WcVjkqgzXCfR7hoTqzBoKI0 +lET1I/xyAmN9bHbtbj45WbmBaTfi+qoRZtEz7EV5EuxvKPZ9TODGxlwKhhAYG7fF +pLsM+7/PEfGLmb9hrAWYk+ZkMCIyIpAuqvCqFLzsU8exGpfSF0P1hfly7Su1CNxq +BFhtUAzIlPaUU1AHRUx9tJ/uwPWNxpgxsm7QB6+7m+egtl/Lgozix4SybjU+8AZ9 +tHvJzN8tu3MMaFubh06veU8AFn2uPy2fWsusb8jFgf/20M57nYryonCfuUXnCWQn +jLlvAWFsfHA9Pg9ZomtIVAT+Dbxfy9PtrdI4/GaCzGglmdS1ncccEEp2fH+yoxOG +9rzLfHN6Hk9dvfOP7GPFp4Tc0hUd6d4/J88Ll3Vh+kpJwl91YD5N92D1cAnb/L2D +UYCTeOv9sPKDgZVlUa/rTLkeEomF6rDOwDZvIQy2Dwb5Z2CDc0vuncjp0aUZ8TXo +rzgiDFXmHQddg3WXnFq8 +=Uio8 +-END PGP SIGNATURE-
svn commit: r25273 - /dev/subversion/subversion-1.10.0-rc1.zip.asc
Author: jcorvel Date: Sun Feb 25 23:44:17 2018 New Revision: 25273 Log: Add my signature for subversion-1.10.0-rc1.zip. Modified: dev/subversion/subversion-1.10.0-rc1.zip.asc Modified: dev/subversion/subversion-1.10.0-rc1.zip.asc == --- dev/subversion/subversion-1.10.0-rc1.zip.asc (original) +++ dev/subversion/subversion-1.10.0-rc1.zip.asc Sun Feb 25 23:44:17 2018 @@ -31,3 +31,20 @@ z/VK3fp9TcZtUQZkGD65lgsx6R8bOaD29LbS4pu3 NX5OjyYANiyw5ysErkb/pQd6vS67H7DDAZuG28e3zKyhpdoYLo0= =gvrI -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJak0k2AAoJELWc5tYBDIqt+04QAKiM5P6UjZ2E1jKyGs5z5Q6e +V+AAgx68wSVFH3yEz6htfWfFX4i5JKHmE17dXY1gNn0H1hwnc3VfPkLee5GJTxRg +k+qq2EJDRAff7hWSNbfw7dKVsTCEhJt+J/HO54WJcVnAsUiYPjyKl8SvMrvbSHtV +rvoLsyMZeztVk7+X8vgngm2gTo0FTml6qQ7yStbK4EP9vmqulxP8f/UmVPZjauyn +wLlqXz/F9gpwZfnhKOHRUVC8p7H6IMhQSY4BnKVLGd7SqBURKt8pCQpiyj2sllE9 +0JmB20x17VAmPnMbyK4ubg6wZcv4kp3UNYnuzyg7JakcL3y/epu6LUTdWpPlYGmn +Gbn2J+wmKBaj/DvUU/8i85iEfAyMxFcjtimg8rqwScEvhPzTmgJOfdwjNeYF0ok7 +nzOuiIlaymws1TyiikmuTVVr2HCOEKpAf4036iSqwT9dnpn7D3GVSplik1NVmXq7 +9fU7QMa5i4stxsyebpPZjQVoE+nt1hWBKIXbC5xsAK6sM2lrhI9cf4+jhiQxNmvl +btfu54vuVSBkCyJuvAzfxTvs2u5FHt4F7iGbu3E4CtdoS9IUFpgBFktRWi3ylfsH +hn9tK5Ng5Qod5pW46y0HBmK7wUV/RBKaC+gx3rCEcrfyAW/lv/x0cgkC8yvR6b/p +Cx6EF1yAdFHi00a0fWaP +=fH2M +-END PGP SIGNATURE-
svn commit: r1818988 - /subversion/trunk/tools/dist/release.py
Author: jcorvel
Date: Thu Dec 21 23:38:43 2017
New Revision: 1818988
URL: http://svn.apache.org/viewvc?rev=1818988&view=rev
Log:
Add write-changelog command to release.py for parsing CHANGES text from
commit messages.
Usage:
release.py write-changelog [--include-unlabeled-summaries] branch previous
branchThe branch (or tag or trunk), relative to
^/subversion/, of which to generate the changelog,
when compared to "previous".
previous The "previous" branch or tag, relative to
^/subversion/, to compare "branch" against.
--include-unlabeled-summaries
Include summary lines that do not have a changes
label, unless an explicit [c:skip] or [c:ignore] is
part of the commit message (except if the summary line
contains 'STATUS', 'CHANGES',
'Post-release housekeeping', 'Follow-up' or starts
with '*').
We try to retain all relevant "changelog lines" from the commit messages.
Changelog lines are lines with the following format:
'['[audience[:section]]']'
or:
'['[audience[:section]]']'
where
audience = U (User-visible) or D (Developer-visible)
section = general|major|minor|client|server|clientserver|other|api|bindings
(section is optional and is treated case-insensitively)
message = the actual text for CHANGES
This means the "changes label" can be used as prefix or suffix, and it
can also be left empty (which results in an uncategorized changes entry),
if the committer isn't sure where the changelog entry belongs.
Putting [skip], [ignore], [c:skip] or [c:ignore] somewhere in the
log message means this commit must be ignored for Changelog processing
(ignored even with the --include-unlabeled-summaries option).
If there is no changes label anywhere in the commit message, and the
--include-unlabeled-summaries option is used, we'll consider the summary
line of the commit message (= first line except if it starts with a *)
as an uncategorized changes entry, except if it contains "status",
"changes", "post-release housekeeping" or "follow-up".
* tools/dist/release.py
(add_to_changes_log): New function.
(print_section): New function.
(print_changes): New function.
(write_changelog): New function.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1818988&r1=1818987&r2=1818988&view=diff
==
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Thu Dec 21 23:38:43 2017
@@ -1174,6 +1174,173 @@ def get_keys(args):
fd.seek(0)
subprocess.check_call(['gpg', '--import'], stdin=fd)
+def add_to_changes_dict(changes_dict, audience, section, change, revision):
+# Normalize arguments
+if audience:
+audience = audience.upper()
+if section:
+section = section.lower()
+change = change.strip()
+
+if not audience in changes_dict:
+changes_dict[audience] = dict()
+if not section in changes_dict[audience]:
+changes_dict[audience][section] = dict()
+
+changes = changes_dict[audience][section]
+if change in changes:
+changes[change].add(revision)
+else:
+changes[change] = set([revision])
+
+def print_section(changes_dict, audience, section, title, mandatory=False):
+if audience in changes_dict:
+audience_changes = changes_dict[audience]
+if mandatory or (section in audience_changes):
+if title:
+print(' - %s:' % title)
+if section in audience_changes:
+print_changes(audience_changes[section])
+elif mandatory:
+print('(none)')
+
+def print_changes(changes):
+# Print in alphabetical order, so entries with the same prefix are together
+for change in sorted(changes):
+revs = changes[change]
+rev_string = 'r' + str(min(revs)) + (' et al' if len(revs) > 1 else '')
+print('* %s (%s)' % (change, rev_string))
+
+def write_changelog(args):
+'Write changelog, parsed from commit messages'
+# Changelog lines are lines with the following format:
+# '['[audience[:section]]']'
+# or:
+#'['[audience[:section]]']'
+# where audience = U (User-visible) or D (Developer-visible)
+# section =
general|major|minor|
svn commit: r1812687 - /subversion/site/README
Author: jcorvel Date: Thu Oct 19 22:01:57 2017 New Revision: 1812687 URL: http://svn.apache.org/viewvc?rev=1812687&view=rev Log: * site/README: Commits get mailed via commits@, not notifications@. Found by: danielsh Modified: subversion/site/README Modified: subversion/site/README URL: http://svn.apache.org/viewvc/subversion/site/README?rev=1812687&r1=1812686&r2=1812687&view=diff == --- subversion/site/README (original) +++ subversion/site/README Thu Oct 19 22:01:57 2017 @@ -9,7 +9,7 @@ a "staging" version, which is in the sta subversion-staging.apache.org). We use the following workflow: 1) Commit your changes to staging. Other developers get the commit mail - via the notifications@ mailinglist. For large or sensitive changes it + via the commits@ mailinglist. For large or sensitive changes it is recommended to send a mail describing your changes to dev@ to draw some extra attention.
svn commit: r1812686 - /subversion/site/README
Author: jcorvel Date: Thu Oct 19 21:50:14 2017 New Revision: 1812686 URL: http://svn.apache.org/viewvc?rev=1812686&view=rev Log: * site/README: Add a note about the "staging" site, and describe the workflow for making changes on staging, and promoting (merging) them to publish. Modified: subversion/site/README Modified: subversion/site/README URL: http://svn.apache.org/viewvc/subversion/site/README?rev=1812686&r1=1812685&r2=1812686&view=diff == --- subversion/site/README (original) +++ subversion/site/README Thu Oct 19 21:50:14 2017 @@ -4,7 +4,23 @@ (Note: this file is not visible on the Subversion site) This tree contains the Subversion web site. The DocumentRoot is pointed -at the publish/ directory. +at the publish/ directory. Apart from the production website we also have +a "staging" version, which is in the staging/ directory (and served as +subversion-staging.apache.org). We use the following workflow: + + 1) Commit your changes to staging. Other developers get the commit mail + via the notifications@ mailinglist. For large or sensitive changes it + is recommended to send a mail describing your changes to dev@ to draw + some extra attention. + + 2) Wait for others to review. Iterate as needed by doing further changes + on staging. + + 3) If any other committer says +1, or if you get no reactions within 72 + hours (lazy consensus), go ahead and "promote" to the live site by + performing a (complete) merge from staging to publish. + +Exception: security announcements are committed directly to the live site. A discussion on how to set up a local mirror of the Subversion site is available at http://subversion.apache.org/docs/community-guide/web.html \ No newline at end of file
svn propchange: r1812683 - svn:log
Author: jcorvel Revision: 1812683 Modified property: svn:log Modified: svn:log at Thu Oct 19 20:23:35 2017 -- --- svn:log (original) +++ svn:log Thu Oct 19 20:23:35 2017 @@ -2,3 +2,12 @@ Create a branch of /site/publish called working on the Subversion website through a new workflow: editing staging and promoting to publish after (lazy) review. The workflow will be described in /site/README. + +See the thread started here on dev@: + + http://mail-archives.apache.org/mod_mbox/subversion-dev/201710.mbox/%3CCAB84uBVL_GR_h09%3D3BB_QaqMUn%2BLfXB-x4MqnVjb%3D%3DD_5d_m%3DA%40mail.gmail.com%3E + Date: Tue, 03 Oct 2017 21:32:13 GMT + From: Johan Corveleyn + To: Subversion dev list + Subject: Workflow for editing the subversion website + Message ID:
svn commit: r1812683 - /subversion/site/staging/
Author: jcorvel Date: Thu Oct 19 20:17:49 2017 New Revision: 1812683 URL: http://svn.apache.org/viewvc?rev=1812683&view=rev Log: Create a branch of /site/publish called /site/staging, so we can start working on the Subversion website through a new workflow: editing staging and promoting to publish after (lazy) review. The workflow will be described in /site/README. Added: subversion/site/staging/ - copied from r1812680, subversion/site/publish/
svn commit: r1810571 - /subversion/site/publish/quick-start.html
Author: jcorvel Date: Mon Oct 2 18:33:03 2017 New Revision: 1810571 URL: http://svn.apache.org/viewvc?rev=1810571&view=rev Log: * publish/quick-start.html: Rework the SVN Quick Start page as discussed on dev@s.a.o [1] [1] https://lists.apache.org/thread.html/da5b9f351a1bf2456aeb85e24ed88ff30b544a70995638af684684f1@%3Cdev.subversion.apache.org%3E Patch by: Pavel Lyalyakin Modified: subversion/site/publish/quick-start.html Modified: subversion/site/publish/quick-start.html URL: http://svn.apache.org/viewvc/subversion/site/publish/quick-start.html?rev=1810571&r1=1810570&r2=1810571&view=diff == --- subversion/site/publish/quick-start.html (original) +++ subversion/site/publish/quick-start.html Mon Oct 2 18:33:03 2017 @@ -17,62 +17,430 @@ Apache Subversion: Quick Start - -Graphical user interface (GUI) clients - ¶ - - -If you are not familiar with Subversion, you may be better served by a -graphical client. (The Subversion project only maintains a command-line-based -clients, but a number of third parties maintain graphical clients that build on -our API (for programmers).) We do not maintain -a list of such clients; instead, we recommend you do a Web search for -Subversion GUI client. - - - - -Make an existing directory a working copy of a new repository - ¶ - - -The following commands will convert a ./my-directory/ containing -files into a working copy of a newly-created repository: - -On Unix: - + + +Installing the SVN client + + +Terminology + + +Basic tasks + + +Branching and tagging + + +Getting more help + + + + + + Installing the SVN client + ¶ + + + Install the svn client to start collaborating on a project + that is using Subversion as its version control system. + + + To install the client program, you can build it yourself from a source + code release or download a binary package. The list of sites where you + can obtain a pre-built Subversion client is available at the + official binary packages page. If you want + to compile the software for yourself, grab the source at the + Source Code page. + + + Right after you install the client you should be able to test it by + issuing the svn command. You should see the following output: + -$ mkdir -p $HOME/.svnrepos/ -$ svnadmin create ~/.svnrepos/my-repos -$ svn mkdir -m "Create directory structure." file://$HOME/.svnrepos/my-repos/trunk file://$HOME/.svnrepos/my-repos/branches file://$HOME/.svnrepos/my-repos/tags -$ cd my-directory -$ svn checkout file://$HOME/.svnrepos/my-repos/trunk ./ -$ svn add --force ./ -$ svn commit -m "Initial import" -$ svn up +$ svn +Type 'svn help' for usage. - -On Windows: - + + Now you can start using the command line client to interact with the + remote repository. + + + +If you are not familiar with Subversion, you may be better served by a +graphical client. We do not maintain a list of such clients; instead, +we recommend you do a Web search for Subversion GUI client. + + + + + + + Terminology + ¶ + + + +What is a Repository? +¶ + + +The repository is a version control database that often resides on a +server and is usually exposed either by an Apache HTTP Server +(through the mod_dav_svn module) or by an svnserve server. +The repository acts as a single source of truth and â as a central +storage â it contains the complete history of changes of the versioned +data in form of revisions. + + +Repository URL examples: + + + + Apache HTTP Server: https://svn.example.com/repos/MyRepo/MyProject/trunk + + + svnserve: svn://svn.example.com/repos/MyRepo/MyProject/branches/MyBranch + + + Direct access (Unix-style): file://var/svn/repos/MyRepo/MyProject/tags/1.1.0 + + + Direct access (Windows-style): file:///C:/Repositories/MyRepo/trunk/MyProject + + + + + +What is a Working Copy? +¶ + + +The working copy is your local and private workspace that you use to +interact with the central Subversion repository. You use the working +copy to modify the contents of your project and fetch changes committed +by others. + + +The working copy contains your project's data and looks and acts like a +regular directory on your local file system, but with one major +difference - the working copy tracks the status and changes of files +and directories within. You can think of the working copy as of a +regular dire
svn propchange: r1809559 - svn:log
Author: jcorvel Revision: 1809559 Modified property: svn:log Modified: svn:log at Mon Sep 25 07:13:11 2017 -- --- svn:log (original) +++ svn:log Mon Sep 25 07:13:11 2017 @@ -1,4 +1,4 @@ * publish/quick-start.html, README, TODO: Add missing svn:eol-style=native property. -Patch by Pavel Lyalyakin +Patch by: Pavel Lyalyakin
svn commit: r1809559 - in /subversion/site: README TODO publish/quick-start.html
Author: jcorvel Date: Sun Sep 24 20:54:24 2017 New Revision: 1809559 URL: http://svn.apache.org/viewvc?rev=1809559&view=rev Log: * publish/quick-start.html, README, TODO: Add missing svn:eol-style=native property. Patch by Pavel Lyalyakin Modified: subversion/site/README (props changed) subversion/site/TODO (props changed) subversion/site/publish/quick-start.html (props changed) Propchange: subversion/site/README -- svn:eol-style = native Propchange: subversion/site/TODO -- svn:eol-style = native Propchange: subversion/site/publish/quick-start.html -- svn:eol-style = native
svn commit: r1806464 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: jcorvel
Date: Mon Aug 28 15:13:06 2017
New Revision: 1806464
URL: http://svn.apache.org/viewvc?rev=1806464&view=rev
Log:
* tests/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit): Move this test to be last in the code,
where it should have been. No functional change.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1806464&r1=1806463&r2=1806464&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Mon Aug 28
15:13:06 2017
@@ -4578,89 +4578,6 @@ test_update_incoming_added_dir_merge2(co
return SVN_NO_ERROR;
}
-static svn_error_t *
-test_cherry_pick_post_move_edit(const svn_test_opts_t *opts,
-apr_pool_t *pool)
-{
- svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- const char *trunk_url;
- svn_opt_revision_t peg_rev;
- apr_array_header_t *ranges_to_merge;
- svn_opt_revision_range_t merge_range;
- svn_client_ctx_t *ctx;
- svn_client_conflict_t *conflict;
- svn_boolean_t tree_conflicted;
-
- SVN_ERR(svn_test__sandbox_create(b,
- "test_cherry_pick_post_move_edit",
- opts, pool));
-
- SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */
- /* Create a copy of node "A". */
- SVN_ERR(sbox_wc_copy(b, "A", "A1"));
- SVN_ERR(sbox_wc_commit(b, "")); /* r2 */
- /* On "trunk", move the file mu. */
- SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-moved"));
- SVN_ERR(sbox_wc_commit(b, "")); /* r3 */
- /* On "trunk", edit mu-moved. This will be r4, which we'll cherry-pick. */
- SVN_ERR(sbox_file_write(b, "A/mu-moved", "Modified content.\n"));
- SVN_ERR(sbox_wc_commit(b, "")); /* r4 */
- SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM));
-
- /* Perform a cherry-pick merge of r4 from A to A1. */
- SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
- trunk_url = apr_pstrcat(b->pool, b->repos_url, "/A", SVN_VA_NULL);
- peg_rev.kind = svn_opt_revision_number;
- peg_rev.value.number = 4;
- merge_range.start.kind = svn_opt_revision_number;
- merge_range.start.value.number = 3;
- merge_range.end.kind = svn_opt_revision_number;
- merge_range.end.value.number = 4;
- ranges_to_merge = apr_array_make(b->pool, 1,
- sizeof(svn_opt_revision_range_t *));
- APR_ARRAY_PUSH(ranges_to_merge, svn_opt_revision_range_t *) = &merge_range;
- /* This should raise a "local delete or move vs incoming edit" conflict. */
- SVN_ERR(svn_client_merge_peg5(trunk_url, ranges_to_merge, &peg_rev,
-sbox_wc_path(b, "A1"), svn_depth_infinity,
-FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-NULL, ctx, b->pool));
-
- SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, "A1/mu-moved"),
- ctx, b->pool, b->pool));
- SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted,
- conflict, b->pool, b->pool));
- SVN_TEST_ASSERT(tree_conflicted);
- {
-svn_client_conflict_option_id_t expected_opts[] = {
- svn_client_conflict_option_postpone,
- svn_client_conflict_option_accept_current_wc_state,
- -1 /* end of list */
-};
-SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
- b->pool));
- }
-
- SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool));
- {
-svn_client_conflict_option_id_t expected_opts[] = {
- svn_client_conflict_option_postpone,
- svn_client_conflict_option_accept_current_wc_state,
- svn_client_conflict_option_local_move_file_text_merge,
- -1 /* end of list */
-};
-SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
- b->pool));
- }
-
- /* Try to resolve the conflict. */
- SVN_ERR(svn_client_conflict_tree_resolve_by_id(
-conflict,
-svn_client_conflict_option_local_move_file_text_merge,
-ctx, b->pool));
-
- return SVN_NO_ERROR;
-}
-
/* Regression test for chrash fixed in r1780259. */
static svn_error_t *
test_cherry_pick_moved_file_with_propdel(const svn_test_opts_t *opts,
@@ -4975,6 +4892,89 @@ test_merge_incoming_move_file_text_merge
return SVN_NO_ERROR;
}
+
+static svn_error_t *
+test_che
svn commit: r1805839 - /subversion/trunk/notes/resolve-moves
Author: jcorvel
Date: Wed Aug 23 00:43:41 2017
New Revision: 1805839
URL: http://svn.apache.org/viewvc?rev=1805839&view=rev
Log:
* notes/resolve-moves
(Finding missing conflict victims): Describe the need to also search
the history of the merge source for moves (in case of a merge operation).
Add an example illustrating why we need this (the cherry-pick post-move
edit case).
Modified:
subversion/trunk/notes/resolve-moves
Modified: subversion/trunk/notes/resolve-moves
URL:
http://svn.apache.org/viewvc/subversion/trunk/notes/resolve-moves?rev=1805839&r1=1805838&r2=1805839&view=diff
==
--- subversion/trunk/notes/resolve-moves (original)
+++ subversion/trunk/notes/resolve-moves Wed Aug 23 00:43:41 2017
@@ -163,7 +163,17 @@ The repository location of the conflict
cannot be found in the working copy ("local missing").
To find such missing nodes, SVN must first find all moves in the entire
-history of the parent directory of the conflict victim.
+history of the parent directory of the conflict victim. Additionally,
+in the case of a merge operation, SVN must also find all moves in the
+history of the parent directory of path@old-rev, all the way up to the
+common ancestor of the root of the merge operation. This is because such
+moves might not have been applied to the target branch (working copy),
+for instance when cherry-picking a file modification, after the file has
+been moved on the source branch (see example at the end of this section).
+
+### jcorvel: Maybe this additional search for moves on the source branch
+ (in case of a merge operation) can be optional? Only do it if
+ the moves found in the first search don't suffice?
For each such move it checks whether the moved node is related to the known
node at path@old-rev, or, if that does not exist, path@new-rev, by tracing
@@ -185,6 +195,34 @@ a path-wise closest node to the conflict
If no such node can be found, SVN assumes that the conflict victim was
deleted instead of moved.
+=== Missing conflict victim due to skipped move in merge source history ===
+
+This can typically happen when cherry-picking a revision with a file
+modification, where this file has been moved on the source branch of the
+merge (and this move was not applied to the target branch):
+
+In r1, create directory A with file mu:
+ Changed paths:
+ A /A
+ A /A/mu
+
+In r2, directory A is copied to A1 (branched):
+ Changed paths:
+ A /A1 (from /A:1)
+
+In r3, A/mu is moved:
+ Changed paths:
+ D /A/mu
+ A /A/mu-moved (from /A/mu:2)
+
+In r4, A/mu-moved is edited:
+ Changed paths:
+ M /A/mu-moved
+
+If we now want to cherry-pick r4 from /A to a working copy of /A1, we get a
+tree conflict because mu-moved is missing. The relevant move we need to
+resolve this happened on /A, in r3.
+
== Determining which, if any, moves apply ==
Next, SVN must determine whether any moves found between old-rev and
svn commit: r1805704 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: jcorvel
Date: Mon Aug 21 23:05:08 2017
New Revision: 1805704
URL: http://svn.apache.org/viewvc?rev=1805704&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit): Correct expectation of this XFAILing
test to make it easier to see what's really missing with this use case.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1805704&r1=1805703&r2=1805704&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Mon Aug 21
23:05:08 2017
@@ -4634,7 +4634,6 @@ test_cherry_pick_post_move_edit(const sv
svn_client_conflict_option_id_t expected_opts[] = {
svn_client_conflict_option_postpone,
svn_client_conflict_option_accept_current_wc_state,
- svn_client_conflict_option_local_move_file_text_merge,
-1 /* end of list */
};
SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
svn commit: r1805589 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: jcorvel
Date: Sun Aug 20 23:52:20 2017
New Revision: 1805589
URL: http://svn.apache.org/viewvc?rev=1805589&view=rev
Log:
Add a new tree conflict resolver test (currently XFAIL) for the case
where we cherry-pick-merge a file edit after the file has been moved on the
source branch.
* subversion/tests/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit): New test.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1805589&r1=1805588&r2=1805589&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sun Aug 20
23:52:20 2017
@@ -4578,6 +4578,90 @@ test_update_incoming_added_dir_merge2(co
return SVN_NO_ERROR;
}
+static svn_error_t *
+test_cherry_pick_post_move_edit(const svn_test_opts_t *opts,
+apr_pool_t *pool)
+{
+ svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
+ const char *trunk_url;
+ svn_opt_revision_t peg_rev;
+ apr_array_header_t *ranges_to_merge;
+ svn_opt_revision_range_t merge_range;
+ svn_client_ctx_t *ctx;
+ svn_client_conflict_t *conflict;
+ svn_boolean_t tree_conflicted;
+
+ SVN_ERR(svn_test__sandbox_create(b,
+ "test_cherry_pick_post_move_edit",
+ opts, pool));
+
+ SVN_ERR(sbox_add_and_commit_greek_tree(b)); /* r1 */
+ /* Create a copy of node "A". */
+ SVN_ERR(sbox_wc_copy(b, "A", "A1"));
+ SVN_ERR(sbox_wc_commit(b, "")); /* r2 */
+ /* On "trunk", move the file mu. */
+ SVN_ERR(sbox_wc_move(b, "A/mu", "A/mu-moved"));
+ SVN_ERR(sbox_wc_commit(b, "")); /* r3 */
+ /* On "trunk", edit mu-moved. This will be r4, which we'll cherry-pick. */
+ SVN_ERR(sbox_file_write(b, "A/mu-moved", "Modified content.\n"));
+ SVN_ERR(sbox_wc_commit(b, "")); /* r4 */
+ SVN_ERR(sbox_wc_update(b, "", SVN_INVALID_REVNUM));
+
+ /* Perform a cherry-pick merge of r4 from A to A1. */
+ SVN_ERR(svn_test__create_client_ctx(&ctx, b, b->pool));
+ trunk_url = apr_pstrcat(b->pool, b->repos_url, "/A", SVN_VA_NULL);
+ peg_rev.kind = svn_opt_revision_number;
+ peg_rev.value.number = 4;
+ merge_range.start.kind = svn_opt_revision_number;
+ merge_range.start.value.number = 3;
+ merge_range.end.kind = svn_opt_revision_number;
+ merge_range.end.value.number = 4;
+ ranges_to_merge = apr_array_make(b->pool, 1,
+ sizeof(svn_opt_revision_range_t *));
+ APR_ARRAY_PUSH(ranges_to_merge, svn_opt_revision_range_t *) = &merge_range;
+ /* This should raise a "local delete or move vs incoming edit" conflict. */
+ SVN_ERR(svn_client_merge_peg5(trunk_url, ranges_to_merge, &peg_rev,
+sbox_wc_path(b, "A1"), svn_depth_infinity,
+FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+NULL, ctx, b->pool));
+
+ SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, "A1/mu-moved"),
+ ctx, b->pool, b->pool));
+ SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted,
+ conflict, b->pool, b->pool));
+ SVN_TEST_ASSERT(tree_conflicted);
+ {
+svn_client_conflict_option_id_t expected_opts[] = {
+ svn_client_conflict_option_postpone,
+ svn_client_conflict_option_accept_current_wc_state,
+ svn_client_conflict_option_local_move_file_text_merge,
+ -1 /* end of list */
+};
+SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
+ b->pool));
+ }
+
+ SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, b->pool));
+ {
+svn_client_conflict_option_id_t expected_opts[] = {
+ svn_client_conflict_option_postpone,
+ svn_client_conflict_option_accept_current_wc_state,
+ svn_client_conflict_option_local_move_file_text_merge,
+ -1 /* end of list */
+};
+SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
+ b->pool));
+ }
+
+ /* Try to resolve the conflict. */
+ SVN_ERR(svn_client_conflict_tree_resolve_by_id(
+conflict,
+svn_client_conflict_option_local_move_file_text_merge,
+ctx, b->pool));
+
+ return SVN_NO_ERROR;
+}
+
/* Regression test for chrash fixed in r1780259. */
static svn_error_t *
test_cherry_pick_moved
svn commit: r1803336 - /subversion/site/publish/faq.html
Author: jcorvel Date: Fri Jul 28 22:01:32 2017 New Revision: 1803336 URL: http://svn.apache.org/viewvc?rev=1803336&view=rev Log: * site/publish/faq.html (dumpload): Add links to ... (fix-nonLF-log): New question & answer explaining how to fix the dreaded "svnadmin: E125005: Cannot accept non-LF line endings in 'svn:log' property" when running 'svnadmin load'. Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1803336&r1=1803335&r2=1803336&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Fri Jul 28 22:01:32 2017 @@ -90,6 +90,9 @@ For older questions, see What is this "dump/load cycle" people sometimes talk about when upgrading a Subversion server? +What can I do about "svnadmin: E125005: Cannot accept +non-LF line endings in 'svn:log' property" while running +'svnadmin load'? How do I allow clients to authenticate against a Windows domain controller using SSPI Authentication? I don't like the ".svn" directory name, and @@ -1584,9 +1587,11 @@ svnadmin: E125005: Cannot accept non-LF This means the svn:log message of the revision has non-LF line endings (these were accepted by older servers, but no longer as of Subversion 1.6). -You can accept this minor corruption by adding --bypass-prop-validation -to your 'svnadmin load' command (you can always repair this later in the -new repository). Or you can try to repair this in the source repository +You can ignore this minor corruption by adding --bypass-prop-validation +to your 'svnadmin load' command (you can always +repair this later in the +new repository). Or you can try to repair this +in the source repository before executing the dump+load (since svn:log is a revision property it can easily be fixed without "rewriting history"). @@ -1623,6 +1628,73 @@ loading. + +What can I do about "svnadmin: E125005: Cannot accept non-LF line endings +in 'svn:log' property" while running 'svnadmin load'? + ¶ + + +This error means the svn:log message of the revision in your +dumpfile / dumpstream has non-LF line endings (these +were accepted by older servers, but no longer as of Subversion 1.6). +You can ignore this minor corruption while loading into your new +repository by adding --bypass-prop-validation to your 'svnadmin load' +command (you can always repair this later in the +new repository). Or you can try to repair this in the source repository +before executing the dump+load (since svn:log is a revision property +it can easily be fixed without "rewriting history"). Also note that +svnsync normalizes this on the fly, so it might be an easier +alternative than dump+load. + +There is no standard procedure for normalizing the line endings in +the svn:log property, but using the administrative commands 'svnlook propget', +'svnlook log' and 'svnadmin setlog' can get you there: + + +svnlook propget -r$REV --revprop $REPOS svn:log gets the +raw svn:log revision property (no normalization, no extra newline at the end). +You can use that to validate it and search for 'non-LF line endings'. + + +svnlook log -r$REV $REPOS gets a normalized version of it +(LF-eols, normalized to UTF8 (if you have the correct "source encoding" set +as your locale), and an extra newline at the end). If you strip of the final +newline, this gives you a nice normalized version of the log message to +feed to ... + + +svnadmin setlog -r$REV $REPOS --bypass-hooks (or without +the --bypass-hooks option if you want the hooks to be run) will set the value +it's reading from stdin as the new log message. + + + +You can stitch them together into a script to handle all revisions +in a repository, like in these bash oneliners: + + +Find the "broken" revisions and echo the revision numbers: + +bash$ YOUNGEST=`svnlook youngest $REPOS`; for (( i=1; i<=$YOUNGEST; i++ )); \ +do svnlook propget -r $i --revprop $REPOS svn:log | xxd -ps -c1 | fgrep '0d' > /dev/null \ +&& echo "$i" ; done; echo "Verified until revision $YOUNGEST" + + + +Find and immediately fix the "broken" revisions with 'svnadmin setlog': + +bash$ YOUNGEST=`svnlook youngest $REPOS`; for (( i=1; i<=$YOUNGEST; i++ )); \ +do svnlook propget -r $i --revprop $REPOS svn:log | xxd -ps -c1 | fgrep '0d' > /dev/null \ +&& echo "Fixing r$i" && svnadmin setlog $REPOS --bypass-hooks -r$i \ +<( svnlook log -r$i $REPOS | sed '$d' ); done; echo "Verified until revision $YOUNGEST" + +(the "sed '$d'" strips off the extra newline that's added by "svnlook log") + + + + + How do I allow clients to authenticate against a Windows domain controller using SSPI authentication?
svn commit: r1803323 - /subversion/site/publish/faq.html
Author: jcorvel
Date: Fri Jul 28 18:58:58 2017
New Revision: 1803323
URL: http://svn.apache.org/viewvc?rev=1803323&view=rev
Log:
* site/publish/faq.html
(dumpload): Add note to watch out for revision property changes after
the initial dump+load has been started.
Suggested by: Doug Robinson (doug.robinson {AT} wandisco.com)
Modified:
subversion/site/publish/faq.html
Modified: subversion/site/publish/faq.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1803323&r1=1803322&r2=1803323&view=diff
==
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Fri Jul 28 18:58:58 2017
@@ -1563,6 +1563,17 @@ Put NEWREPOS online <-- end of mainte
Some things to watch out for:
+Watch out for changes to log messages
+(or other revision properties) after you start the initial dump+load and
+before you lock down the old repository.
+Those won't be transferred with the incremental dump+load(s).
+So either make sure the pre-revprop-change hook is "closed" while you're
+running the initial dump+load, or keep a log of all changed revision
+properties (for instance write them to a log file from your
+post-revprop-change hook) and transfer them to the new repository
+afterwards (for instance using 'svnlook log' and 'svnadmin setlog').
+
+
You might run into:
svnadmin: E125005: Invalid property value found in dumpstream; consider
repairing the
svn commit: r1803274 - /subversion/site/publish/faq.html
Author: jcorvel Date: Fri Jul 28 13:55:36 2017 New Revision: 1803274 URL: http://svn.apache.org/viewvc?rev=1803274&view=rev Log: * site/publish/faq.html (dumpload): Rework and extend this section, with a more complex procedure for dump+load with minimal downtime. This is based on the following post to the users list: http://mail-archives.apache.org/mod_mbox/subversion-users/201606.mbox/%3CCAB84uBUTuzgYL7z1ZhiW%2BnoVeVYe6R78VcpXer2VqQsAkq2%2B-g%40mail.gmail.com%3E Date: Thu, 16 Jun 2016 10:49:43 GMT From: Johan Corveleyn To: Subversion users list Subject: Re: Invalid character in hex checksum? Message ID: Modified: subversion/site/publish/faq.html Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1803274&r1=1803273&r2=1803274&view=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Fri Jul 28 13:55:36 2017 @@ -1395,11 +1395,35 @@ see https://issues.apache.org/j Subversion's repository database schema has changed occasionally -during development. Old repositories, created with a pre-1.0 -development version of Subversion, may require the following operation -when upgrading. If a schema change happens between Subversion -releases X and Y, then repository administrators upgrading to Y must -do the following: +during development. To take advantage of new features, you may have +to dump and load the repository to recreate the back-end database. +However, most upgrades of Subversion do not involve a +dump and load. When one is required, the release notes and the +CHANGES file for the new version will carry prominent notices about +it. If you don't see such a notice, then there has been no schema +change, and no dump/load is necessary. + +An alternative to dump/load is using +http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.replication"; +>svnsync to replicate the repository into a new one. This is a bit +slower, but is more flexible, and has some extra normalization-features +which are not (yet) available with dump/load (svnsync normalizes properties +to LF line-endings on the fly and has a --source-prop-encoding option +to convert them to UTF-8, which is required in newer repository formats +--- see below for how to handle this with dump/load). + +Note: Both dump/load and svnsync only cover the repository +database, not the repository hook scripts, configuration files and +locks. These need to be copied over manually from source to target +(see below in the "complex procedure"). +If you need to copy the complete repository, without rebuilding the back-end +database, http://svnbook.red-bean.com/en/1.8/svn.reposadmin.maint.html#svn.reposadmin.maint.backup"; +>svnadmin hotcopy may be a better option. + +For small repositories that can afford some downtime, this is a +simple dump/load procedure to upgrade from Subversion version X to Y ( +see below for a more complex procedure with minimal downtime for larger +repositories): Shut down svnserve, Apache, and anything else that might be @@ -1441,17 +1465,150 @@ do the following: +For larger repositories, where you want to minimize the maintenance window, +a slightly more complex procedure can be used. The trick is to +dump+load to a new location, while the old repository is still +accessible (for checkouts and commits). After this is done (can take +hours, or even days, weeks) you note the last revision which was +loaded (or check the revision number with 'svnlook youngest +newrepos'), and start another dump+load where you dump with +'--incremental -rNEXTREV:HEAD' (where NEXTREV is the next revision +that needs to be dumped). You can iterate over this as long as you keep the old repository open +... At the end you make the original repository inaccessible for a +couple of minutes, while you enable the new one (Caveat: if you move +your new repos in the same disk location as the old one, and you use +Apache httpd to serve it, make sure you restart httpd to reset its +caches). + +Tip: for a large repo I strongly suggest building the new repository +(the target of your 'svnadmin load') on very fast storage, even +ramdisk if possible, and running 'svnadmin pack' while on fast storage +(and copy it over to the final disk afterwards). It's +the 'svnadmin load' part that is very time-consuming right now (this +will probably be much improved in svn 1.10, with the +--no-flush-to-disk option for 'svnadmin load'). + +Your commands will look like the following: + + +svnadmin create NEWREPOS + +(maybe create it on a ramdisk) + + + +If you have custom hook scripts in OLDREPOS/hooks (all files +not ending in .tmpl, as those are the default templates), review them, +and copy them over
svn commit: r20287 - /dev/subversion/subversion-1.8.18.zip.asc
Author: jcorvel Date: Mon Jul 3 21:28:04 2017 New Revision: 20287 Log: Add my signature for 1.8.18 (Windows) Modified: dev/subversion/subversion-1.8.18.zip.asc Modified: dev/subversion/subversion-1.8.18.zip.asc == --- dev/subversion/subversion-1.8.18.zip.asc (original) +++ dev/subversion/subversion-1.8.18.zip.asc Mon Jul 3 21:28:04 2017 @@ -8,3 +8,20 @@ prmRtzjBSOdcC5xv8YOewsIhIyFBMkqrLBnxdG0W sY3hTQWvnBlvEneP+UeITYvif+TmcwIO52gfBIZQWROybHA2uQRjll6QwaiVfrw= =2Hti -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJZWqwQAAoJELWc5tYBDIqtSyYQALpJMOOfP1zmlW14m2cehUQQ +VLSCi2XLrBfK+QqDOBbEDyKNnmoDCtQPz2PpC6CtTDV946TN6m8DDV9BFc8tJZ4t +K92GK9SmRlwQLpLKL3wM8XxSIya3ZOFQQ56pL36H9Ct4bYSX3VTDQtdAhl1gEbcF +Rkj8THnBX79Kr84mlUuG71GbRdMtFzHPwa7Kvcl/1C1DjCoKebAzmQsRCZM1A3+b +NmzUlhBeC1iTgOFlFuLDs8qMu278u8vk9f32ymCmYqsGYEq6YLMjaea5Bx21EkRq +yrpc8qqjM+vBWQsSV5HtuWAGnBl5m5H410iPtmmPe4cZlcLja0mQ3vRUj3cOUm2e +Nu0QpHQAxNSzOuGRoN68yOXsSFCe6Ne34ZWzM8EdGBwu2c+trljzE6Z2Os9ry+q4 +XvVKqkfhMk6EE10aC116j/bF0gtOsAPYKEltb2V/aYm7ksm8XQ5f7iqJNLhaQOmx +MOlIj85nAN7ikSFk9FJYDxVJxBR/k95cvLnC9pgHnUzYTnps5TLUJLoOjSCjgPCd +etbNilmj/J38jTlCgmjQC3+mLIHe+ZHe3XIunowkxibjsm//KdBmLo0G7GGD6AVL +dp6139LU7Twh4FWUpgN4WmIjh4Vb9UZ2CA6rVCbb8a+78wNdD6PYxJTQ8KYtgMIX +SxlHj7z4CmQyv0ihtGt7 +=559v +-END PGP SIGNATURE-
svn commit: r20250 - /dev/subversion/subversion-1.9.6.zip.asc
Author: jcorvel Date: Sat Jul 1 15:48:34 2017 New Revision: 20250 Log: Add my signature for 1.9.6 (Windows) Modified: dev/subversion/subversion-1.9.6.zip.asc Modified: dev/subversion/subversion-1.9.6.zip.asc == --- dev/subversion/subversion-1.9.6.zip.asc (original) +++ dev/subversion/subversion-1.9.6.zip.asc Sat Jul 1 15:48:34 2017 @@ -14,3 +14,20 @@ ThKf2qETlJflGDdHktfcGkYhCmLGIDI4o248xu9J 4HUzdPOyNfV7zeRQ57xQOinNtjplg5vYrEvqCSJS =bomd -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJZV6l9AAoJELWc5tYBDIqtdoYP/RNB7fhUkDXog6Eajqw6oe4+ +p62ak9GvPvMPDPOKqNXlWrPtpvlRJ2bQu9czJ0lV7T+y9JdlGNYEc9QGt4jfdrV2 +CJJqdETQI0vCA1G9EujEfCEnrHPDY66nQAeK28kxYfZNtWDwlDeoRcJPSU2Gnagz +/4WURzcB/C1j5bXc3pcDAEpAfWQFIWNel9mrRdA76AvTJ979Z1voHS/w0uJbbTgL +d3mjGcpBaxRoZgprRsPHP/HCKUbsI+CiGTa6Mcx+KUE+WwDa3VN4ZXwfIhxwvDMA +M1+c4S0ezUI8rkkgsiVDeGOtZQPxk6FMTb63dYplGiZupJUAILJ0MiHFeKtFN2zl +C9IuG5pMKZumeBrSuddyKRWpRNXZzoaTbMeI08Kauk5DDQS7IKN4nEPx4+UaUNEg +/9/raDk+5Jkx3UlkYLGiS8i8iUMi8pJJq8eyG8k+FSVsNVcOz2SzQXT91au8bbjP +V7mxbRfO8vMn2HU+/5q7zoCc0MTktKDTjTODgQ3s4kkbgqEfv9bSDiy3GSjYo7TH +JvDhwa/CZt5tlFM4cx7A9mN3cNbuf57KOK9WqK0ptdI6XD2mBbCAc1cHtQJ78VtS +YNhOHZtfJ5hWVkSxKo6bqXtO19ILA9n/Bcsw+pAVzLRDJQhUryqk2PrcleCNGNoo +H9+/BQwErsT4aDoZ5wni +=AgyR +-END PGP SIGNATURE-
