Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
On Tue, May 17, 2011 at 1:30 AM, Kalle Sommer Nielsen wrote: > 2011/5/16 Ferenc Kovacs : > > ok, thanks for the heads up. > > should I revert and commit them again for all three branch, or merge them > > for the other two? (5.4, trunk) > > Merging is way easier, as you already committed theres no point in > reverting just to re-add it, more of a good practice for next time to > do a sparse > > -- > regards, > > Kalle Sommer Nielsen > ka...@php.net > sorry, I've already started when you replied. I will commit to the three branches from now on. Tyrael
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt branches/PHP_5_4/ext/standard/tests/network/gethostbynamel_error.phpt trunk/ext/standard/tests/networ
tyrael Mon, 16 May 2011 23:33:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=36 Log: fix the test with the removal of the unnecessary newline Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbynamel_error.phpt U php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:31:14 UTC (rev 35) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:33:05 UTC (rev 36) @@ -19,7 +19,6 @@ $hostname = 'string_val'; $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); - echo "Done"; ?> --EXPECTF-- @@ -34,5 +33,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL - Done Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:31:14 UTC (rev 35) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:33:05 UTC (rev 36) @@ -19,7 +19,6 @@ $hostname = 'string_val'; $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); - echo "Done"; ?> --EXPECTF-- @@ -34,5 +33,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL - Done Modified: php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:31:14 UTC (rev 35) +++ php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 23:33:05 UTC (rev 36) @@ -19,7 +19,6 @@ $hostname = 'string_val'; $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); - echo "Done"; ?> --EXPECTF-- @@ -34,5 +33,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL - Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
2011/5/16 Ferenc Kovacs : > ok, thanks for the heads up. > should I revert and commit them again for all three branch, or merge them > for the other two? (5.4, trunk) Merging is way easier, as you already committed theres no point in reverting just to re-add it, more of a good practice for next time to do a sparse -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
ok, thanks for the heads up. should I revert and commit them again for all three branch, or merge them for the other two? (5.4, trunk) Tyrael On Mon, May 16, 2011 at 11:30 PM, Pierrick Charron wrote: > And also easier to revert since there is just one commit for all branches. > > On 16 May 2011 17:28, Kalle Sommer Nielsen wrote: > >> Hi >> >> 2011/5/16 Ferenc Kovacs : >> > oh, so you favor that over merging between the branches? >> > Tyrael >> >> Yeah, less spam on php.cvs :) >> >> -- >> regards, >> >> Kalle Sommer Nielsen >> ka...@php.net >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> >
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
And also easier to revert since there is just one commit for all branches. On 16 May 2011 17:28, Kalle Sommer Nielsen wrote: > Hi > > 2011/5/16 Ferenc Kovacs : > > oh, so you favor that over merging between the branches? > > Tyrael > > Yeah, less spam on php.cvs :) > > -- > regards, > > Kalle Sommer Nielsen > ka...@php.net > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
Hi 2011/5/16 Ferenc Kovacs : > oh, so you favor that over merging between the branches? > Tyrael Yeah, less spam on php.cvs :) -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
On Mon, May 16, 2011 at 11:17 PM, Kalle Sommer Nielsen wrote: > Hi > > 2011/5/16 Ferenc Kovacs : > > tyrael Mon, 16 May 2011 19:51:39 + > > > > Revision: http://svn.php.net/viewvc?view=revision&revision=311106 > > > > Log: > > fix the test with the removal of the unnecessary newline > > > > Changed paths: > >U > php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt > > Please keep all the branches in sync (PHP_5_3, PHP_5_4 and trunk), you > can use a sparse checkout and commit it all at once. > > oh, so you favor that over merging between the branches? Tyrael
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
Hi 2011/5/16 Ferenc Kovacs : > tyrael Mon, 16 May 2011 19:51:39 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=311106 > > Log: > fix the test with the removal of the unnecessary newline > > Changed paths: > U > php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt Please keep all the branches in sync (PHP_5_3, PHP_5_4 and trunk), you can use a sparse checkout and commit it all at once. -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/network/ gethostbynamel_error.phpt
tyrael Mon, 16 May 2011 19:51:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=311106 Log: fix the test with the removal of the unnecessary newline Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 19:49:59 UTC (rev 311105) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-16 19:51:39 UTC (rev 311106) @@ -19,7 +19,6 @@ $hostname = 'string_val'; $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); - echo "Done"; ?> --EXPECTF-- @@ -34,5 +33,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL - Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt trunk/ext/standard/tests/network/gethostbynamel_error.phpt
rasmus Sun, 15 May 2011 01:52:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=311037 Log: We can't really predict what will happen on an unknown host lookup since bogus ISPs like Comcast and many others try to "help" by resolving everything to their own search page. Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt U php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-15 01:00:05 UTC (rev 311036) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-15 01:52:07 UTC (rev 311037) @@ -20,10 +20,6 @@ $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); -echo "\n-- Testing gethostbynamel() with an unknown host --\n"; -$hostname = 'unknownhost_zzz_xxx_yyy.'; -var_dump( gethostbynamel($hostname) ); - echo "Done"; ?> --EXPECTF-- @@ -39,6 +35,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL --- Testing gethostbynamel() with an unknown host -- -bool(false) Done Modified: php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt === --- php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-15 01:00:05 UTC (rev 311036) +++ php/php-src/trunk/ext/standard/tests/network/gethostbynamel_error.phpt 2011-05-15 01:52:07 UTC (rev 311037) @@ -20,10 +20,6 @@ $extra_arg = 10; var_dump( gethostbynamel($hostname, $extra_arg) ); -echo "\n-- Testing gethostbynamel() with an unknown host --\n"; -$hostname = 'unknownhost_zzz_xxx_yyy.'; -var_dump( gethostbynamel($hostname) ); - echo "Done"; ?> --EXPECTF-- @@ -39,6 +35,4 @@ Warning: gethostbynamel() expects exactly 1 parameter, 2 given in %s on line %d NULL --- Testing gethostbynamel() with an unknown host -- -bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php