Re: com php-src: Added back support for undocummented host:port syntax: ext/ldap/ldap.c ext/ldap/tests/ldap_connect_variation.phpt

From: Date: Mon, 23 Nov 2015 02:19:12 +0000
Subject: Re: com php-src: Added back support for undocummented host:port syntax: ext/ldap/ldap.c ext/ldap/tests/ldap_connect_variation.phpt
References: 1 2 3  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89982@lists.php.net to get a copy of this message
Le jeudi 19 novembre 2015, 09:29:30 Ferenc Kovacs a écrit : > this was only meant for PHP-5.6, but it seems that this is also present in > PHP-7.0 and master. > Côme, if you did not change your mind then you should revert this commit > (and probably also 391087ed280f86f144ffa5a2b72eeeda3c271743) from PHP-7.0 > and merge up the revert commit to master. Hum, I tried to do that and something strange happenned: the push on master worked but of PHP-7.0 it says «remote: Welcome mcmic. remote: You have insufficient Karma! remote: I'm sorry, I cannot allow you to write to remote: php-src.git/ remote: Have a nice day. To git@git.php.net:/php-src.git ! [remote rejected] php-7.0 -> php-7.0 (pre-receive hook declined)» This means I don’t have the karma to revert commits? > in the future if you want to add something on a lower branch you can either > do this (commit lowest branch, merge up, revert the commit in higher > branch, merge up) or use > git merge -s ours to practically discard the content of the commit when > merging up. Ok, I’ll keep that in mind.

« previous php.cvs (#89982) next »