Re: com php-src: Bumped SAPI version to 6.9: sapi/litespeed/lsapi_main.c

From: Date: Wed, 09 Dec 2015 15:04:29 +0000
Subject: Re: com php-src: Bumped SAPI version to 6.9: sapi/litespeed/lsapi_main.c
References: 1 2  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90187@lists.php.net to get a copy of this message
Hi Anatol, Sorry, I did not follow the workflow strictly this time. If need I can redo the commits. When I apply the same change to different branches, I always prefer cherry-pick over merging two whole branches. The reason is that because PHP7 codebase has big changes, the changes to PHP-5.x branches may not need to or be able to apply cleanly to master. Seems PHP7 is main focus now, so I did the change on PHP7 first, then cherry picked to PHP 5.6. Next time, I will start with PHP 5.6 branch. Just realized that PHP 7.0 got its own branch now. I totally missed that. someone already applied the change. Thanks! Best regards, George Wang On 12/9/2015 5:45 AM, Anatol Belski wrote: > Hi George, > >> -----Original Message----- >> From: George Wang [mailto:gwang@php.net] >> Sent: Wednesday, December 9, 2015 6:28 AM >> To: php-cvs@lists.php.net >> Subject: [PHP-CVS] com php-src: Bumped SAPI version to 6.9: >> sapi/litespeed/lsapi_main.c >> >> Commit: 00ed55005a684f49cd52e0ff83f59fbbcace9828 >> Author: George Wang <gwang@php.net> Wed, 9 Dec 2015 00:19:18 - >> 0500 >> Parents: 0d84097d44233e777ee1e88f9dbdf5fad3a642d1 >> Branches: PHP-5.6 >> >> Link: http://git.php.net/?p=php- >> src.git;a=commitdiff;h=00ed55005a684f49cd52e0ff83f59fbbcace9828 >> >> Log: >> Bumped SAPI version to 6.9 >> >> Changed paths: >> M sapi/litespeed/lsapi_main.c >> >> > Please follow the https://wiki.php.net/vcs/gitworkflow . > Commits in lower branches need to be merged up into master. > > Thanks > > Anatol >

« previous php.cvs (#90187) next »