[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Format bump to f21

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Fri, 12 Nov 2010 08:42:56 -0600

On Fri, Nov 12, 2010 at 2:49 AM, Bert Huijben <bert_at_qqmail.nl> wrote:
>> -----Original Message-----
>> From: hyrum_at_hyrumwright.org [mailto:hyrum_at_hyrumwright.org] 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
Received on 2010-11-12 15:43:36 CET

This is an archived mail posted to the Subversion Dev mailing list.