Bert says he is done implementing the new conflict storage
scheme, and that it needs a format bump to be enabled by default.
It seems the necessary upgrade code is already in place.
I'd like to do some work on top of the new conflict storage so
it would be nice to see it enabled soon (this week).
There are some additional ideas queued up for this format bump:
/* TODO: Rename the "absent" presence value to "server-excluded". wc_db.c
and this file have references to "absent" which still need to be changed
to "server-excluded". */
/* TODO: Un-confuse *_revision column names in the EXTERNALS table to
"-r<operative> foo@<peg>", as suggested by the patch attached to
/* TODO: Remove column parent_relpath from EXTERNALS. We're not using it and
never will. It's not interesting like in the NODES table: the external's
parent path may be *anything*: unversioned, "behind" a another WC... */
AFAIK we'll also need to bump the format for inherited properties.
Should we try to get all of this into a single format bump?
We could also burn a couple of format numbers before releasing the
final 1.8 format, couldn't we? If so, I'd like to perform a format
bump including the new conflict storage and the absent -> server-exluded
rename (which I suggested), and leave the other items for others
to handle in one or more separate bumps. Any objections?
Received on 2012-09-18 17:12:15 CEST