SS>> clearly a proven model.
SS>>
SS>> What do the active developers on this list think?
I think there's no problem in having PHP4 and PHP5 in single repository as
branches. However, I can live with different modules too. So far I have
seen almost no arguments from either side besides t
James Cox wrote:
There is a cumulative patch available here:
http://cvs.php.net/~imajes/big.patch.gz which incorporates all the
changes from PHP_4_3 to HEAD, which I merged. Simply by reversing the
patch and applying it backwards to your code should be sufficient to
remove the changes occurred when
> Just to clarify. The proposal is:
Right. Nice diagram :)
> If so, I am all for it. A version-agnostic php-src module with
> appropriate branches and tags would be very nice. This tree looks more
> complicated than it actually is. Obviously a number of the branches are
> inactive and do
On Mon, 23 Jun 2003, Sascha Schumann wrote:
> Here is a plan.
>
> - rename /repository/php5 to /repository/php-src
> - copy PHP_4_3 tags to PHP_4 branch (i.e. reset the PHP 4
> head branch to the current 4.3 code)
> - workaround Zend/ZendEngine2 issue (they should be in the
>
At 08:04 PM 6/23/2003 +0200, Sascha Schumann wrote:
> 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.
On Mon, 23 Jun 2003, Rasmus Lerdorf wrote:
> I agree with the single module for evolutionary code approach.
>
> Should we disable CVS for a while to stop commits until this gets cleaned
> up? I think this problem needs the special Sascha touch.
sounds like a good plan to me
Derick
--
"Interp
On Mon, 23 Jun 2003, Sascha Schumann wrote:
> > 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.
>
Sounds good. If you have time do it in that way.
+1
At 20:04 23.06.2003 +0200, Sascha Schumann wrote:
> 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
On Mon, 2003-06-23 at 14:04, Sascha Schumann wrote:
> > 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 m
> 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.
Here is a plan.
- rename /repository/php5 t
On Mon, Jun 23, 2003 at 10:32:56AM -0700, Rasmus Lerdorf wrote:
> 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 organi
>
> At 10:32 AM 6/23/2003 -0700, Rasmus Lerdorf wrote:
> >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 or
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 imposs
At 10:32 AM 6/23/2003 -0700, Rasmus Lerdorf wrote:
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.
Maybe it's
On Mon, 23 Jun 2003, James Cox wrote:
> > 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).
> >
>
> The opportunity was made available, many times.
Lack of feedback does
>
> 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).
>
The opportunity was made available, many times.
-- james
--
PHP Internals - PHP Runtime Development Mailing Li
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
>
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 di
James, in the past, there was very little interest in a PHP 4
HEAD branch, if you care to recall. Because your rashness
has rendered diff and merge unusable between PHP 4/5, we can
only expect to see even less interest.
Lowering the bar should be the answer to faiding interest
>
> There is one fix for all of this, the most appropriate fix,
> which is to properly revert a file to revisions previous to
> the first php5 development, and then bring HEAD into sync
> with the branch [1].
>
The reference here was
http://elib.cs.berkeley.edu/admin/cvs/cvsrevert.html ... S
>
> The problem is that I now have conflicts in my changes
> because CVS was doing its job and merging changes into my
> local code. In addition, some of my changes have been
> clevery merged with 4.3 specific changes. So, I have to go
> and audit my code by hand and check which of the change
> 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
On Mon, 23 Jun 2003, Allowee wrote:
> can't somebody just put the yesterday backup of the repository in there?
> check the list to patch the files which where not backed up.
>
> all comments are welcome, just don't tell me that there is NO backup.
I made a backup, cause I was expecting this. Thi
On Monday 23 June 2003 17:43, 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
>
>
Err, no.
*Hacking the repository is not using revision control properly*.
The problem is that I now have conflicts in my changes because CVS was
doing its job and merging changes into my local code. In addition, some
of my changes have been clevery merged with 4.3 specific changes.
So, I have to
On Mon, 23 Jun 2003, Sascha Schumann wrote:
[snip]
> 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
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
After all discussions what should we do with our 2 checkouts (PHP5-HEAD and
PHP 4.3.3RC2).
I have checked out php5 and used HEAD. -> Looks good
On my harddisk is also a checkout of php4 with tag PHP4_3 (this seems to be
the same with the STABLE snapshot)
Today I checked also out php4 HEAD and ha
>
> The point is that there are now a number of core developers
> who updated their existing php5 checkouts and now have a load
> of crap from 4.3 merged into their php5 development.
>
For what it's worth, the last 5 or so warning emails I have dropped onto
the list making it very clear what th
The point is that there are now a number of core developers who updated
their existing php5 checkouts and now have a load of crap from 4.3
merged into their php5 development.
Yes, its a nice idea to make php4 HEAD work for php4 again, but after a
grace period to allow people to migrate to the "rea
On Mon, 2003-06-23 at 11:35, Derick Rethans wrote:
> Sure, and delete my work from my current checkout right away then? You
> obviously have no clue.
I didn't say that, Derick. You can still get a CVS diff that you can
apply to the php5 tree and keep working.
> > Breakage is neccessary sometime
On Mon, 23 Jun 2003, Per Lundberg wrote:
> On Mon, 2003-06-23 at 11:04, Derick Rethans wrote:
> > Great, thanks for this nice mess, we now ended up with useles PHP 4.3
> > checkouts with PHP 5 development stuff in it.
>
> Yeah, what's the big deal about that? Just get the php5 module from
> CVS
On Mon, 2003-06-23 at 11:04, Derick Rethans wrote:
> Great, thanks for this nice mess, we now ended up with useles PHP 4.3
> checkouts with PHP 5 development stuff in it.
Yeah, what's the big deal about that? Just get the php5 module from
CVS...
Breakage is neccessary sometimes. James: thanks
On Mon, 23 Jun 2003, James Cox wrote:
> The next stage to happen is that I will bring php4 HEAD into sync with
> the 4.x development branch, so expect a big patch.
ARGH! Didn't I ask you NOT to do this... you just created a lot of
trouble for people working with a php5 checkout (co php5)... it n
34 matches
Mail list logo
