Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-28 Thread Jani Taskinen
Gwynne Raskind wrote: On Jul 27, 2009, at 6:31 PM, Takeshi Abe wrote: Just to be sure, is there any consensus on this? I thought I should use svn merge. README.SVN-RULES says 1. All changes should first go to trunk and then get merged from trunk (aka MFH'ed) to all other relevant bran

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-28 Thread Lukas Kahwe Smith
On 28.07.2009, at 01:38, Takeshi Abe wrote: Hi, On Mon, 27 Jul 2009 18:44:20 -0400, Gwynne Raskind > wrote: README.SVN-RULES says 1. All changes should first go to trunk and then get merged from trunk (aka MFH'ed) to all other relevant branches. which I've been following so far.

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-28 Thread Rasmus Lerdorf
Moriyoshi Koizumi wrote: > Incorporating the changes and merges across the branches into one > commit under a sparse-layouted local copy doesn't do the book-keeping > against svn:mergeinfo. That's why I suppose it is not a good idea. I don't think a merge will work the way we use branches though.

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-28 Thread Moriyoshi Koizumi
Incorporating the changes and merges across the branches into one commit under a sparse-layouted local copy doesn't do the book-keeping against svn:mergeinfo. That's why I suppose it is not a good idea. Moriyoshi On Tue, Jul 28, 2009 at 7:44 AM, Gwynne Raskind wrote: > On Jul 27, 2009, at 6:31 P

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-27 Thread Takeshi Abe
Hi, On Mon, 27 Jul 2009 18:44:20 -0400, Gwynne Raskind wrote: >> README.SVN-RULES says >> >>1. All changes should first go to trunk and then get merged from trunk >> (aka MFH'ed) to all other relevant branches. >> >> which I've been following so far. > > That document is outdated. It'

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-27 Thread Gwynne Raskind
On Jul 27, 2009, at 6:31 PM, Takeshi Abe wrote: Just to be sure, is there any consensus on this? I thought I should use svn merge. README.SVN-RULES says 1. All changes should first go to trunk and then get merged from trunk (aka MFH'ed) to all other relevant branches. which I've be

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-27 Thread Takeshi Abe
Hi, On Tue, 28 Jul 2009 01:54:53 +0900, Moriyoshi Koizumi wrote: > Just to be sure, is there any consensus on this? I thought I should > use svn merge. README.SVN-RULES says 1. All changes should first go to trunk and then get merged from trunk (aka MFH'ed) to all other relevant branc

Re: [PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-27 Thread Moriyoshi Koizumi
Just to be sure, is there any consensus on this? I thought I should use svn merge. Moriyoshi On Tue, Jul 28, 2009 at 12:30 AM, David Soria Parra wrote: > On 2009-07-27, Takeshi Abe wrote: >> Log: >> MFH: fixed #48732 (TTF Bounding box wrong for letters below baseline) and >> #48801 (Problem wit

[PHP-DEV] Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt

2009-07-27 Thread David Soria Parra
On 2009-07-27, Takeshi Abe wrote: > Log: > MFH: fixed #48732 (TTF Bounding box wrong for letters below baseline) and > #48801 (Problem with imagettfbbox) please commit the changes to 5.3/5.2 and trunk at once in one changeset instead of MFH'ing. Thanks -- PHP Internals - PHP Runtime Developmen