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/