Author: julianfoad
Date: Wed Mar 2 15:41:02 2022
New Revision: 1898532
URL: http://svn.apache.org/viewvc?rev=1898532&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: sync with trunk@1898531.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1898530-1898531
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/main.py?rev=1898532&r1=1898531&r2=1898532&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/main.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/main.py
Wed Mar 2 15:41:02 2022
@@ -802,7 +802,7 @@ def copy_trust(dst_cfgdir, src_cfgdir):
def _with_wc_format_version(args):
if '--compatible-version' in args \
- or any(one_arg.startswith('--compatible-version=') for one_arg in args) \
+ or any(str(one_arg).startswith('--compatible-version=') for one_arg in
args) \
or options.wc_format_version is None:
return args
non_opt_args = [a for a in args if not str(a).startswith('-')]
