Author: kotkov
Date: Mon Dec 5 11:47:44 2022
New Revision: 1905755
URL: http://svn.apache.org/viewvc?rev=1905755&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905754.
Modified:
subversion/branches/pristines-on-demand-on-mwf/ (props changed)
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1905504-1905754
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py?rev=1905755&r1=1905754&r2=1905755&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py
Mon Dec 5 11:47:44 2022
@@ -300,7 +300,7 @@ def revert_reexpand_keyword(sbox):
svntest.main.file_write(newfile_path, unexpanded_contents)
# Revert the file. The keyword should reexpand.
- svntest.main.run_svn(None, 'revert', newfile_path)
+ run_and_verify_revert([newfile_path], [], [newfile_path])
# Verify that the keyword got re-expanded.
check_expanded(newfile_path)
@@ -333,7 +333,7 @@ def revert_reexpand_keyword(sbox):
'-m', "Shouldn't be committed")
# Revert the file. The file is not reverted!
- svntest.actions.run_and_verify_svn([], [], 'revert', newfile_path)
+ run_and_verify_revert([newfile_path], [], [])
#----------------------------------------------------------------------
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py?rev=1905755&r1=1905754&r2=1905755&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
Mon Dec 5 11:47:44 2022
@@ -1583,6 +1583,27 @@ def upgrade_1_0_with_externals(sbox):
})
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+@XFail()
+@SkipUnless(lambda: svntest.main.options.wc_format_version is None)
+def upgrade_latest_format(sbox):
+ "upgrade latest format without arguments"
+
+ sbox.build(empty=True, create_wc=False)
+ expected_output = svntest.wc.State(sbox.wc_dir, {})
+ expected_disk = svntest.wc.State('', {})
+ latest_ver = svntest.main.svn_wc__max_supported_format_version()
+ svntest.actions.run_and_verify_checkout(sbox.repo_url,
+ sbox.wc_dir,
+ expected_output,
+ expected_disk,
+ [],
+ '--compatible-version',
+ latest_ver)
+ # XFAIL:
+ # svn: E155021: Working copy '...' is already at version 1.15 (format 32)
+ # and cannot be downgraded to version 1.8 (format 31)
+ svntest.actions.run_and_verify_svn(None, [], 'upgrade', sbox.wc_dir)
+
########################################################################
# Run the tests
@@ -1639,6 +1660,7 @@ test_list = [ None,
upgrade_1_7_dir_external,
auto_analyze,
upgrade_1_0_with_externals,
+ upgrade_latest_format,
]
