Hi All,
I have patches against PHP5.0.0 to make PHP5.0.0 work for NetWare.
What is the ideal way in which these changes can be merged in the CVS
HEAD?
I have small patches against 68 files.
a) Is it advisable to send all 68 patches in one single patch?
b) Is it advisable to categorize the patches like cli, apache2filter,
zend, tsrm etc 68 patches in one single patch?
c) Is it advisable to submit each one of 68 patches to the concerned
owner?
Waiting for your reponse.
With regards
Kamesh Jayachandran
Hi All,
I have patches against PHP5.0.0 to make PHP5.0.0 work for NetWare.
What is the ideal way in which these changes can be merged in the CVS
HEAD?
Can you please post a link to this patch here?
regards,
Derick
Hi Derick,
Thanks for responding.
I am posting my patches module by module.
For zend you can find the patches at the following locations.
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
Let me know in case of any issues.
With regards
Kamesh Jayachandran
On Wed, 14 Jul 2004 17:53:03 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Hi All,
I have patches against PHP5.0.0 to make PHP5.0.0 work for NetWare.
What is the ideal way in which these changes can be merged in the CVS
HEAD?Can you please post a link to this patch here?
regards,
Derick
Sorry to reply to my own mail.
Updated patch for a small clean up.
Please take the latest one.
With regards
Kamesh Jayachandran
On Wed, 14 Jul 2004 23:20:37 -0700, "Kamesh Jayachandran"
kameshj@fastmail.fm said:
Hi Derick,
Thanks for responding.
I am posting my patches module by module.
For zend you can find the patches at the following locations.
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gzLet me know in case of any issues.
With regards
Kamesh Jayachandran
On Wed, 14 Jul 2004 17:53:03 +0200 (CEST), "Derick Rethans"
derick@php.net said:Hi All,
I have patches against PHP5.0.0 to make PHP5.0.0 work for NetWare.
What is the ideal way in which these changes can be merged in the CVS
HEAD?Can you please post a link to this patch here?
regards,
Derick
Hi Derick,
Thanks for responding.
I am posting my patches module by module.
For zend you can find the patches at the following locations.
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
-
This patch is the wrong way around (you swapped old and new in the
diff command). -
Tons of whitespace is introduced (bad idea to mix with code changes)
-
I think you screwed up line ending problems, all our code has Unix
style line endinds.
other than that it looks okay, though I'm not sure if we need too those
really long comments in the code.
regards,
Derick
Hi Derick,
Can you guide me how to produce the patch?
I thought
'diff -u newsource oldsource '
will give the patch.
Is it other way round?
I will lokk into white space issue.
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 12:00:11 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Hi Derick,
Thanks for responding.
I am posting my patches module by module.
For zend you can find the patches at the following locations.
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
This patch is the wrong way around (you swapped old and new in the
diff command).Tons of whitespace is introduced (bad idea to mix with code changes)
I think you screwed up line ending problems, all our code has Unix
style line endinds.other than that it looks okay, though I'm not sure if we need too those
really long comments in the code.regards,
Derick
Can you guide me how to produce the patch?
I thought
'diff -u newsource oldsource '
will give the patch.
Is it other way round?
Yes it is.
regards,
Derick
Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 12:46:51 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Can you guide me how to produce the patch?
I thought
'diff -u newsource oldsource '
will give the patch.
Is it other way round?Yes it is.
regards,
Derick
Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 12:46:51 +0200 (CEST), "Derick Rethans"
Line endings are still screwed up..
/Magnus
--
For your penance, say five Hail Marys and one loud BLAH!
Hi Magnus,
Sorry for wasting your time.
I have removed all those ^M s.
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
Verify the same and commit the changes.
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 13:19:58 +0200, "Magnus Määttä" magnus@php.net
said:
Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 12:46:51 +0200 (CEST), "Derick Rethans"Line endings are still screwed up..
/Magnus
--
For your penance, say five Hail Marys and one loud BLAH!
Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gz
One tip for next time, you can also just make ONE patch for all files,
by doing something like:
diff -u Zend Zend.netware
(of course, you need to have to seperate directories for it). But this
does make things much easier.
I'll have a look now.
regards,
Derick
Hi Derick,
Following are my patches.
http://puggy.symonds.net/~kameshj/sapi.tar.gz
http://puggy.symonds.net/~kameshj/ext.tar.gz
http://puggy.symonds.net/~kameshj/main.patch.gz
http://puggy.symonds.net/~kameshj/mainstreams.patch.gz
http://puggy.symonds.net/~kameshj/TSRM.patch.gz
I will be happy if i could get the commit access to some of the NetWare
specific files like config.nw.c.
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 13:20:38 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gzOne tip for next time, you can also just make ONE patch for all files,
by doing something like:diff -u Zend Zend.netware
(of course, you need to have to seperate directories for it). But this
does make things much easier.I'll have a look now.
regards,
Derick
Hi Derick,
Did you apply my patches?
With regards
Kamesh Jayachandran
On Thu, 15 Jul 2004 08:12:49 -0700, "Kamesh Jayachandran"
kameshj@fastmail.fm said:
Hi Derick,
Following are my patches.
http://puggy.symonds.net/~kameshj/sapi.tar.gz
http://puggy.symonds.net/~kameshj/ext.tar.gz
http://puggy.symonds.net/~kameshj/main.patch.gz
http://puggy.symonds.net/~kameshj/mainstreams.patch.gz
http://puggy.symonds.net/~kameshj/TSRM.patch.gzI will be happy if i could get the commit access to some of the NetWare
specific files like config.nw.c.With regards
Kamesh JayachandranOn Thu, 15 Jul 2004 13:20:38 +0200 (CEST), "Derick Rethans"
derick@php.net said:Hi Derick,
Now I have corrected it and removed the white spaces whereever not
required.
Can you verify the same and commit my changes.
You can get them at,
http://puggy.symonds.net/~kameshj/zendnetwarepatches.tar.gzOne tip for next time, you can also just make ONE patch for all files,
by doing something like:diff -u Zend Zend.netware
(of course, you need to have to seperate directories for it). But this
does make things much easier.I'll have a look now.
regards,
Derick
Hi Derick,
Did you apply my patches?
You'll have to wait until I get back from holiday, but don't worry I'll
have a look at them. It's on my todo list.
Derick
Hi Derick,
Did you apply my patches?
With regards
Kamesh Jayachandran
On Mon, 19 Jul 2004 21:29:47 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Hi Derick,
Did you apply my patches?You'll have to wait until I get back from holiday, but don't worry I'll
have a look at them. It's on my todo list.Derick
Hi Derick,
Did you apply my patches?
Not yet, but I will. I just returned today.
Derick
Hi Derick,
Just a remainder to apply my patches for NetWare port.
With regards
Kamesh Jayachandran
On Mon, 2 Aug 2004 16:19:56 +0200 (CEST), "Derick Rethans"
derick@php.net said:
Hi Derick,
Did you apply my patches?Not yet, but I will. I just returned today.
Derick
Hi Derick,
Just one more reminder to apply my patches for NetWare port.
With regards
Kamesh Jayachandran
On Fri, 13 Aug 2004 01:10:56 -0700, "Kamesh Jayachandran"
kameshj@fastmail.fm said:
Hi Derick,
Just a remainder to apply my patches for NetWare port.With regards
Kamesh JayachandranOn Mon, 2 Aug 2004 16:19:56 +0200 (CEST), "Derick Rethans"
derick@php.net said:Hi Derick,
Did you apply my patches?Not yet, but I will. I just returned today.
Derick