You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/10/02 14:55:10 UTC
svn commit: r1842630 - in /subversion/branches/1.10.x: ./ STATUS
subversion/tests/cmdline/svnadmin_tests.py
subversion/tests/cmdline/svntest/main.py
subversion/tests/cmdline/svntest/wc.py
Author: brane
Date: Tue Oct 2 14:55:10 2018
New Revision: 1842630
URL: http://svn.apache.org/viewvc?rev=1842630&view=rev
Log:
* branches/1.10.x/STATUS: Vote for r1839739.
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py
subversion/branches/1.10.x/subversion/tests/cmdline/svntest/wc.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 2 14:55:10 2018
@@ -102,4 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1840991,1842260,1842262,1842264
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1842630&r1=1842629&r2=1842630&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Oct 2 14:55:10 2018
@@ -23,7 +23,7 @@ Candidate changes:
Notes:
This was a separate followup on changes that were already backported.
Votes:
- +1: rhuijben
+ +1: rhuijben, brane
+0: danielsh
Veto-blocked changes:
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svnadmin_tests.py?rev=1842630&r1=1842629&r2=1842630&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svnadmin_tests.py Tue Oct 2 14:55:10 2018
@@ -3883,7 +3883,8 @@ def check_recover_prunes_rep_cache(sbox,
raise svntest.Failure
@Issue(4077)
-@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
+@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(svntest.main.python_sqlite_can_read_without_rowid)
def recover_prunes_rep_cache_when_enabled(sbox):
"recover prunes rep cache when enabled"
sbox.build()
@@ -3891,7 +3892,8 @@ def recover_prunes_rep_cache_when_enable
check_recover_prunes_rep_cache(sbox, enable_rep_sharing=True)
@Issue(4077)
-@SkipUnless(svntest.main.is_fs_type_fsfs_and_sqlite_can_read_our_db)
+@SkipUnless(svntest.main.is_fs_type_fsfs)
+@SkipUnless(svntest.main.python_sqlite_can_read_without_rowid)
def recover_prunes_rep_cache_when_disabled(sbox):
"recover prunes rep cache when disabled"
sbox.build()
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py?rev=1842630&r1=1842629&r2=1842630&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svntest/main.py Tue Oct 2 14:55:10 2018
@@ -1633,13 +1633,14 @@ def server_has_atomic_revprop():
def server_has_reverse_get_file_revs():
return options.server_caps.has_reverse_get_file_revs
-def python_sqlite_can_read_our_db():
+def python_sqlite_can_read_our_wc_db():
"""Check if the Python builtin is capable enough to peek into wc.db"""
# Currently enough (1.7-1.9)
return svntest.sqlite3.sqlite_version_info >= (3, 6, 18)
-def is_fs_type_fsfs_and_sqlite_can_read_our_db():
- return is_fs_type_fsfs() and python_sqlite_can_read_our_db()
+def python_sqlite_can_read_without_rowid():
+ """Check if the Python builtin is capable enough to read new rep-cache"""
+ return svntest.sqlite3.sqlite_version_info >= (3, 8, 2)
def is_plaintext_password_storage_disabled():
try:
Modified: subversion/branches/1.10.x/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/svntest/wc.py?rev=1842630&r1=1842629&r2=1842630&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/svntest/wc.py Tue Oct 2 14:55:10 2018
@@ -1092,7 +1092,7 @@ def svn_uri_quote(url):
def python_sqlite_can_read_wc():
"""Check if the Python builtin is capable enough to peek into wc.db"""
- return svntest.main.python_sqlite_can_read_our_db()
+ return svntest.main.python_sqlite_can_read_our_wc_db()
def open_wc_db(local_path):
"""Open the SQLite DB for the WC path LOCAL_PATH.