Author: svn-role Date: Fri Dec 18 04:00:12 2020 New Revision: 1884588 URL: http://svn.apache.org/viewvc?rev=1884588&view=rev Log: Merge r1879198 from trunk:
* 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 Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/libsvn_wc/wc-metadata.sql Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1879198 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1884588&r1=1884587&r2=1884588&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Dec 18 04:00:12 2020 @@ -89,15 +89,3 @@ Veto-blocked changes: Approved changes: ================= - - * 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 Modified: subversion/branches/1.10.x/subversion/libsvn_wc/wc-metadata.sql URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_wc/wc-metadata.sql?rev=1884588&r1=1884587&r2=1884588&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/libsvn_wc/wc-metadata.sql (original) +++ subversion/branches/1.10.x/subversion/libsvn_wc/wc-metadata.sql Fri Dec 18 04:00:12 2020 @@ -636,7 +636,7 @@ ON NODES (wc_id, moved_to, op_depth); CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum); -UPDATE nodes SET presence = "server-excluded" WHERE presence = "absent"; +UPDATE nodes SET presence = 'server-excluded' WHERE presence = 'absent'; /* Just to be sure clear out file external skels from pre 1.7.0 development working copies that were never updated by 1.7.0+ style clients */