From: David D. Kilzer (ddkilzer@ti.com)
Date: Mon Feb 08 1999 - 18:18:08 CST
Daniel Stenberg <Daniel.Stenberg@sth.frontec.se> wrote:
>On Mon, 8 Feb 1999, David D. Kilzer wrote:
>
>> >* CVS server with the full 2b13 source online, for reading by everyone, by
>> > writing for me (or else it won't be that useful to me). When Kent's
>> > version becomes available, it should be stored there too.
>>
>> I would argue that any of Kent's changes from b3-b4 should be *merged*
>> into the CVS tree ASAP instead of creating another CVS archive for his
>> branch. (If this is what you meant to say, I just wanted to make that
>> point clear.)
>
>Well, anyone that has scanned through the 2b13 source and compared it with b3
>may have spotted that they differ quite a lot. Merging them (b4 with b13)
>will take time and therefore I think it may be necessary to at first, store
>both of them separately while working on the merge.
>
>But yes, I want to merge them.
Actually, Kent just needs to create a b3->b4 diff, then attempt to apply
that to whatever your current release is, since your b13 is based off of
Kent's b3. No need to do a full diff between Kent's and your releases.
>(btw, I will use a new naming scheme for coming releases, they will now be
>named alphas, until they turn reasonably stable)
Are you going to start with "a14" to keep the numbers the same? Might
be (somewhat) less confusing.
Dave