Author: kotkov
Date: Wed Nov 23 12:42:06 2022
New Revision: 1905483
URL: http://svn.apache.org/viewvc?rev=1905483&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Remove the XFail() marker from
upgrade_tests.py#16.
The underlying problem has been fixed in r1905324, where we started to persist
the pristine mode in a working copy. The upgrade now preserves the available
pristines in a working copy, so a revert completes without errors.
* subversion/tests/cmdline/upgrade_tests.py
(replaced_files): Remove the XFail() marker.
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
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=1905483&r1=1905482&r2=1905483&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
Wed Nov 23 12:42:06 2022
@@ -861,10 +861,6 @@ def delete_in_copy_upgrade(sbox):
'b347d1da69df9a6a70433ceeaa0d46c8483e8c03']])
-# XFAIL when pristines-on-demand enabled: at the revert step the pristines
-# are missing and it can't fetch them as repo no longer exists. See #4891.
-@Issue(4891)
-@XFail(lambda: svntest.main.options.wc_format_version=='1.15')
def replaced_files(sbox):
"upgrade with base and working replaced files"
