Where to start the Apache 2.0 code base

[Bill Stoddard <st...@raleigh.ibm.com>]

There seems to be three camps on the best way to create the Apache 2.0
code base.

Camp 1: Use the apache-mpm tree as the base. Merge 1.3.8 changes up into
Apache 2.0.
Dean, Ben L., Jim, Bill

Camp 2: Use 1.3.8 as the base, then add MPM, HOOKS, APR, etc.
Roy, Ken

Camp 3: Don't care
everyone else :-)

The approches are at odds with each other. IMHO it will be easier to
merge 1.3.8 changes into the apache-mpm/2.0 tree than the otherway
around. 

How important is it to maintain history? I don't see much point in it.
Lets move apache-mpm into the top level apache-2.0 directory, merge in
the 1.3.8 diffs then version all the files 1.1. 

-- 
Bill Stoddard
stoddard@raleigh.ibm.com

Re: Where to start the Apache 2.0 code base

[Greg Stein <gs...@lyra.org>]

Bill Stoddard wrote:
> 
> There seems to be three camps on the best way to create the Apache 2.0
> code base.
> 
> Camp 1: Use the apache-mpm tree as the base. Merge 1.3.8 changes up into
> Apache 2.0.
> Dean, Ben L., Jim, Bill
> 
> Camp 2: Use 1.3.8 as the base, then add MPM, HOOKS, APR, etc.
> Roy, Ken
> 
> Camp 3: Don't care
> everyone else :-)
> 
> The approches are at odds with each other. IMHO it will be easier to
> merge 1.3.8 changes into the apache-mpm/2.0 tree than the otherway
> around.
> 
> How important is it to maintain history? I don't see much point in it.
> Lets move apache-mpm into the top level apache-2.0 directory, merge in
> the 1.3.8 diffs then version all the files 1.1.

I'm in Camp 1. +1 for that approach. It definitely seems easier to
forward-merge into MPM than the other way around.

If people want history, the old repository is available.

Cheers,
-g

--
Greg Stein, http://www.lyra.org/

Re: Where to start the Apache 2.0 code base

[Bill Stoddard <st...@raleigh.ibm.com>]

Dean Gaudet wrote:

> > then version all the files 1.1.
> 
> I don't see the point, you'd lose the (meagre) revision history we already
> have in mpm.  That revision history is important to the MPM development.
> It's just numbers.
Agreed. Strike reversioning the files in apache-mpm. I assumed you did
not reversion the files in apache-mpm and I see now that you did. Cool.

-- 
Bill Stoddard
stoddard@raleigh.ibm.com

Re: Where to start the Apache 2.0 code base

[Dean Gaudet <dg...@arctic.org>]

On Mon, 2 Aug 1999, Bill Stoddard wrote:

> The approches are at odds with each other. IMHO it will be easier to
> merge 1.3.8 changes into the apache-mpm/2.0 tree than the otherway
> around. 

agreed.  actions > words, camp 1's job is trivial compared to camp 2's
job, and no progress can be made while we wait for camp 2. 

> How important is it to maintain history? I don't see much point in it.

+1

> Lets move apache-mpm into the top level apache-2.0 directory, merge in
> the 1.3.8 diffs

+1

> then version all the files 1.1. 

I don't see the point, you'd lose the (meagre) revision history we already
have in mpm.  That revision history is important to the MPM development. 
It's just numbers.

Dean

Re: Where to start the Apache 2.0 code base

[Brian Behlendorf <br...@hyperreal.org>]

On Mon, 2 Aug 1999, Dirk-Willem van Gulik wrote:
> On Mon, 2 Aug 1999, Bill Stoddard wrote:
> 
> > Camp 1: Use the apache-mpm tree as the base. Merge 1.3.8 changes up into
> > Apache 2.0.
> > Dean, Ben L., Jim, Bill
> Dirkx
Brian.

Re: Where to start the Apache 2.0 code base

[Dirk-Willem van Gulik <di...@webweaving.org>]

On Mon, 2 Aug 1999, Bill Stoddard wrote:

> Camp 1: Use the apache-mpm tree as the base. Merge 1.3.8 changes up into
> Apache 2.0.
> Dean, Ben L., Jim, Bill
Dirkx

Dw.