Author: danielsh
Date: Fri Jun 26 13:31:27 2020
New Revision: 1879238

URL: http://svn.apache.org/viewvc?rev=1879238&view=rev
Log:
* 1.10.x/STATUS (r1879198),
  1.14.x/STATUS (r1879198): Merge two nominations of the same revision.

Modified:
    subversion/branches/1.10.x/STATUS
    subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1879238&r1=1879237&r2=1879238&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Jun 26 13:31:27 2020
@@ -64,20 +64,13 @@ Candidate changes:
    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
-
- * r1879198
-   Fix invalid escape sequence in working copy queries which causes upgrades
-   from Subversion 1.7 working copies to fail with recent SQLite versions (>=
-   3.29.0).
-   Justification:
-     Causes user-visible errors.
-   Votes:
-     +1: danielsh
+     +1: rhuijben, danielsh
 
 Veto-blocked changes:
 =====================

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1879238&r1=1879237&r2=1879238&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Jun 26 13:31:27 2020
@@ -66,20 +66,13 @@ Candidate changes:
    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
-
- * r1879198
-   Fix invalid escape sequence in working copy queries which causes upgrades
-   from Subversion 1.7 working copies to fail with recent SQLite versions (>=
-   3.29.0).
-   Justification:
-     Causes user-visible errors.
-   Votes:
-     +1: danielsh
+     +1: rhuijben, danielsh
 
 Veto-blocked changes:
 =====================


Reply via email to