On the 'pristines-on-demand-on-mwf' branch: adjust a test to XFAIL.
* subversion/tests/cmdline/upgrade_tests.py
(replaced_files): Reference XFAIL in pristines-on-demand mode.
@@ -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"
