Author: svn-role Date: Sun Aug 27 04:00:04 2023 New Revision: 1911946 URL: http://svn.apache.org/viewvc?rev=1911946&view=rev Log: Merge r1907124 from trunk:
* r1907124 svntest/main.py: Remove wrong comma that broke tests with --enable-sasl Justification: Syntax error. Votes: +1: stsp, rhuijben +0: hartmannathan (haven't tested yet; intend to upgrade to +1 soon) +0: dsahlberg (reviewed, not tested) Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1907124 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1911946&r1=1911945&r2=1911946&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Sun Aug 27 04:00:04 2023 @@ -34,12 +34,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1907124 - svntest/main.py: Remove wrong comma that broke tests with --enable-sasl - Justification: - Syntax error. - Votes: - +1: stsp, rhuijben - +0: hartmannathan (haven't tested yet; intend to upgrade to +1 soon) - +0: dsahlberg (reviewed, not tested) Modified: subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py?rev=1911946&r1=1911945&r2=1911946&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/branches/1.14.x/subversion/tests/cmdline/svntest/main.py Sun Aug 27 04:00:04 2023 @@ -1360,7 +1360,7 @@ def write_restrictive_svnserve_conf(repo fp.write("groups-db = groups\n") if options.enable_sasl: fp.write("realm = svntest\n" - "[sasl]\n", + "[sasl]\n" "use-sasl = true\n"); else: fp.write("password-db = passwd\n")