Julian Foad wrote: > * Re-base pristines-on-demand on top of multi-wc-format.
Done: branch 'pristines-on-demand-on-mwf'. > * Make pristines-on-demand behaviour conditional on WC format. Mostly done in r1897977. I could do with some help on a SQL test failure (below), please. Quoting from that log message: - With 'make check WC_FORMAT_VERSION=1.15': test suite still passes. - With 'make check [WC_FORMAT_VERSION=1.8]': some tests FAIL or XPASS: XPASS: authz_tests.py 31: remove a subdir with authz file XPASS: basic_tests.py 8: basic corruption detection on commit [[Relies on wc.text_base_path()]] XPASS: revert_tests.py 2: revert reexpands manually contracted keyword XPASS: trans_tests.py 1: commit new files with keywords active from birth [[Relies on wc.text_base_path()]] XPASS: trans_tests.py 3: committing eol-style change forces text send [[Relies on wc.text_base_path()]] XPASS: update_tests.py 83: missing tmp update caused segfault [[The error message has changed]] XPASS: upgrade_tests.py 16: upgrade with base and working replaced files [[Can't fetch pristines: the working copy points to file:///tmp/repo]] XPASS: upgrade_tests.py 34: automatic SQLite ANALYZE FAIL: wc-queries-test 3: test query expectations >From a quick look, the XPASSes may be just a matter of '@Wimp' annotations that had been added on one of these branches, now being out of date, or something like that. I will check them. I have posted separately asking for help with the FAIL in test_query_expectations(). - Julian