Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:2644
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Message-ID: <5.2.0.9.0.20030623194608.02b07a20@pop3.web.de>
Date: Mon, 23 Jun 2003 19:46:18 +0200
To: internals@lists.php.net
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
Subject: RE: [PHP-DEV] CVS Administriva (important)
From: uwe@thetaphi.de (Uwe Schindler)

At 10:32 23.06.2003 -0700, you wrote:
>On Mon, 23 Jun 2003, Andi Gutmans wrote:
>
> > At 05:43 PM 6/23/2003 +0200, Sascha Schumann wrote:
> > >     Can someone explain why James just made it impossible to
> > >     properly work with source code which resides in PHP 4 and 5?
> > >
> > >     - diffing is impossible
> > >     - merging is impossible
> > >     - history of new commits becomes fragmented
> > >
> > >     James, why did not you discuss this first?  All opensource BSDs
> > >     have been using _one_ source module since their inception.
> > >     In the case of FreeBSD, that dates back to 1993, so this is
> > >     clearly a proven model.
> > >
> > >     What do the active developers on this list think?
> >
> > I am not quite sure how/what broke. However, no matter if what James did
> > was the right or wrong thing to do, I think it should have been discussed
> > first (in detail).
>
>A bunch of things are broken.  Files are missing in php4 head and the
>wrong versions of files are also in there.  I think we need to roll this
>change back as soon as possible and take another shot at this in a much
>more organized manner.

How about making patch from PHP_4_3 to new HEAD and reverse-apply it to 
HEAD and commit...?