Author: danielsh
Date: Mon Feb 12 16:12:11 2018
New Revision: 1824000
URL: http://svn.apache.org/viewvc?rev=1824000&view=rev
Log:
Merge r1823989 from trunk:
* r1823989
Correct the generated fsfs.conf file's statement of the default value of
verify-before-commit. It is keyed not on --enable-debug but on
--enable-maintainer-mode (on Windows there is no distinction between the
two).
Justification:
Don't mislead users into wrongly believing verification is enabled.
Votes:
+1: danielsh, stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 12 16:12:11 2018
@@ -100,4 +100,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,1822996,1823202-1823203,1823327
+/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,1822996,1823202-1823203,1823327,1823989
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1824000&r1=1823999&r2=1824000&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Feb 12 16:12:11 2018
@@ -21,16 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1823989
- Correct the generated fsfs.conf file's statement of the default value of
- verify-before-commit. It is keyed not on --enable-debug but on
- --enable-maintainer-mode (on Windows there is no distinction between the
- two).
- Justification:
- Don't mislead users into wrongly believing verification is enabled.
- Votes:
- +1: danielsh, stsp
-
* r1823966
Shelving: fix unsafe 'system' calls.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1824000&r1=1823999&r2=1824000&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_fs_fs/fs_fs.c Mon Feb 12
16:12:11 2018
@@ -1151,8 +1151,8 @@ write_config(svn_fs_t *fs,
"[" CONFIG_SECTION_DEBUG "]" NL
"###" NL
"### Whether to verify each new revision immediately before finalizing" NL
-"### the commit. The default is false in release-mode builds, and true" NL
-"### in debug-mode builds." NL
+"### the commit. This is disabled by default except in maintainer-mode" NL
+"### builds." NL
"# " CONFIG_OPTION_VERIFY_BEFORE_COMMIT " = false" NL
;
#undef NL
