On Fri, Nov 12, 2010 at 2:49 AM, Bert Huijben <[email protected]> wrote: >> -----Original Message----- >> From: [email protected] [mailto:[email protected]] On Behalf Of >> Hyrum K. Wright >> Sent: donderdag 11 november 2010 22:42 >> To: Subversion Development >> Subject: Format bump to f21 >> >> As part of moving tree conflict information storage to the victim >> nodes, I'll be bumping the format to f21 shortly. It is pretty >> unobtrusive, and the upgrade code and test has already been committed >> in r1034155. The upgrade should be painless for folks, but I figured >> I'd just give fair warning. >> >> If nobody has concerns, I'll do the bump tomorrow. > > +1 > > So next up is moving the rest of the conflict data into the same skel? > (Which might or might not be possible without a format bump)
Well, I've actually considered a rapid bump to f22 which just moves all the tree conflict data from the conflict_data column to the tree_conflict_data column. The reason I didn't go straight there in f21 is because upgrading to a separate column is much easier than trying to ensure we don't overwrite uncaptured tree_conflict_data. The data currently being stored in the conflict_data column (as of f21) isn't of the correct form to permit future extensions. The end format outlined in notes/wc-ng/conflict-storage requires a lot more information than we currently capture, so it may be a *long* time before we can fully implement it. That's the reason I'd like to move the tree_conflict data back to the proper column in f22 and then leave conflict_data null. -Hyrum
