Author: julianfoad
Date: Wed Apr 6 14:52:08 2022
New Revision: 1899618
URL: http://svn.apache.org/viewvc?rev=1899618&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: adjust a test to XFAIL.
* subversion/tests/cmdline/upgrade_tests.py
(replaced_files): Reference #4891. XFAIL in pristines-on-demand mode.
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=1899618&r1=1899617&r2=1899618&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 Apr 6 14:52:08 2022
@@ -866,7 +866,10 @@ def delete_in_copy_upgrade(sbox):
'b347d1da69df9a6a70433ceeaa0d46c8483e8c03']])
-@Wimp("Can't fetch pristines: the working copy points to file:///tmp/repo")
+# 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"
