RE: [PHP-CVS] com php-src: Bumped SAPI version to 6.9: sapi/litespeed/lsapi_main.c
| From: | Anatol Belski | Date: | Wed, 09 Dec 2015 17:07:21 +0000 |
| Subject: | RE: [PHP-CVS] com php-src: Bumped SAPI version to 6.9: sapi/litespeed/lsapi_main.c | ||
| References: | 1 2 3 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-90189@lists.php.net to get a copy of this message | ||
Hi George,
> -----Original Message-----
> From: George Wang [mailto:gwang@litespeedtech.com]
> Sent: Wednesday, December 9, 2015 4:04 PM
> To: Anatol Belski <anatol.php@belski.net>; 'George Wang' <gwang@php.net>;
> php-cvs@lists.php.net
> Subject: Re: [PHP-CVS] com php-src: Bumped SAPI version to 6.9:
> sapi/litespeed/lsapi_main.c
>
> 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!
>
It actually doesn't matter which branch you start in. Fe if you start in 5.6 and feel
you'd better not to port right at the moment, you could merge from 5.6 into 7.0 with
--strategy=ours. That would in fact produce an empty merge, but will indeed be workflow complaint.
As we follow this workflow, and if some patches left in a lower branch, next person who merges will
possibly experience merge conflicts produced by someone else :) This time it was me, luckily there
was no merge conflicts, but maybe you could check that nothing went wrong by the auto merge. Indeed
the diff between 5 and 7 majors is big, but conflicts sometimes happen even when merging between two
minor versions.
So in general you could use the following strategy
- apply 5.6 specific patch in PHP-5.6, do an empty merge up to master
- apply 7.0 specific patch in PHP-7.0, merge up to master
- same when there are more branches, or when the conflict resolution is not worth it
If automatic merge between branches just works, so that's the best scenario how it could go.
It's just important to not to leave commits not merged up in the lower branches, so other
fellow contributors don't possibly run into merge conflicts that they're not supposed to
fix.
Regards
Anatol