I think this branch is now ready to merge to trunk.
In a series of commits I have added '--wc-format-version' argument to
the C and Python test suite framework on this branch, and tested that it
works with both '1.15' (the default, WC format 32) and '1.14' (wc format 31).
I tested that the desired format is actually being used in WCs when this
option is passed in to the test suite, using this temporary code:
```
Index: subversion/libsvn_wc/wc_db.c
===================================================================
--- subversion/libsvn_wc/wc_db.c (revision 1897914)
+++ subversion/libsvn_wc/wc_db.c (working copy)
@@ -1508,2 +1508,9 @@ svn_wc__db_init(svn_wc__db_t *db,
+#define FORMAT_EXPECTED 31
+ if (wcroot->format != FORMAT_EXPECTED)
+ {
+ SVN_DBG(("### format is %d; expected %d", wcroot->format,
FORMAT_EXPECTED));
+ SVN_ERR_MALFUNCTION_NO_RETURN();
+ }
+
/* Any previously cached children may now have a new WCROOT, most
likely that
@@ -13464,2 +13471,8 @@ svn_wc__db_upgrade_begin(svn_sqlite__db_
+ if (wcroot->format != FORMAT_EXPECTED)
+ {
+ SVN_DBG(("### format is %d; expected %d", wcroot->format,
FORMAT_EXPECTED));
+ SVN_ERR_MALFUNCTION_NO_RETURN();
+ }
+
/* The WCROOT is complete. Stash it into DB. */
```
These checks occur after create_db() calls. I think they cover most if
not all places where a WC can be created.
That would seem to be everything we need on this branch.
Any further thoughts about readiness to merge to trunk, Brane or anyone?
- Julian
