# Should we dev on master then backport, or the other way? - Thread: https://externals.io/message/77662 - Original archive: https://news-web.php.net/php.internals/77662 - Started by Florian Margaine on 2014-09-26T11:29:58+00:00 - Messages: 7 - Reply by email to internals@lists.php.net - More for agents: search with https://externals.io/search.md?q={query} · RFCs at https://externals.io/rfc.md · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt --- ## #77662 — Florian Margaine — 2014-09-26T11:29:58+00:00 URL: https://externals.io/message/77662#77662 Hi internals, The question is in the title :-) As far as I know, most projects follow this convention: develop on the master branch, then backport the fixes/features to older versions. I had a discussion with another core dev who told me he did the opposite: develop on PHP-5.5, then move the fix/feature up to the new branches (first PHP-5.6, then master). Is there a convention for php-src? Or is it "whatever the dev wants"? -- Regards, *Florian Margaine* --- ## #77665 — Remi Collet — 2014-09-26T11:42:20+00:00 URL: https://externals.io/message/77662#77665 · In reply to: #77662 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Le 26/09/2014 13:29, Florian Margaine a écrit : > Hi internals, > > The question is in the title :-) > > As far as I know, most projects follow this convention: develop on > the master branch, then backport the fixes/features to older > versions. > > I had a discussion with another core dev who told me he did the > opposite: develop on PHP-5.5, then move the fix/feature up to the > new branches (first PHP-5.6, then master). Yes this way. > > Is there a convention for php-src? Or is it "whatever the dev > wants"? > See https://wiki.php.net/vcs/gitworkflow Remi -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlQlURwACgkQYUppBSnxahh+aQCffuNOmQJeSSAVjn9lCIx1YMl0 qk0AoOkHVzo7r85HxpxSDn1z98Y4ZVEc =GRTv -----END PGP SIGNATURE --- ## #77666 — Ferenc Kovacs — 2014-09-26T11:43:40+00:00 URL: https://externals.io/message/77662#77666 · In reply to: #77662 On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine wrote: > Hi internals, > > The question is in the title :-) > > As far as I know, most projects follow this convention: develop on the > master branch, then backport the fixes/features to older versions. > > I had a discussion with another core dev who told me he did the opposite: > develop on PHP-5.5, then move the fix/feature up to the new branches (first > PHP-5.6, then master). > > Is there a convention for php-src? Or is it "whatever the dev wants"? > > -- > > Regards, > > *Florian Margaine* > see https://wiki.php.net/vcs/gitworkflow if a change affects multiple branch we commit it to the lowest possible branch and merge it upwards. there were a recent discussion about whether or not to change this, as the current master (aka PHP7) has major changes which makes the merge everything up strategy a lot more painful, but this discussion didn't reached a consensus so there are no change in the old workflow. -- Ferenc Kovács @Tyr43l - http://tyrael.hu --- ## #77667 — Florian Margaine — 2014-09-26T11:48:04+00:00 URL: https://externals.io/message/77662#77667 · In reply to: #77666 I see, thanks for the answer! > > > On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine > wrote: > > > […] > > see https://wiki.php.net/vcs/gitworkflow > if a change affects multiple branch we commit it to the lowest possible > branch and merge it upwards. > there were a recent discussion about whether or not to change this, as the > current master (aka PHP7) has major changes which makes the merge > everything up strategy a lot more painful, but this discussion didn't > reached a consensus so there are no change in the old workflow. > > -- > Ferenc Kovács > @Tyr43l - http://tyrael.hu > -- Regards, *Florian Margaine* --- ## #77678 — Derick Rethans — 2014-09-26T15:20:35+00:00 URL: https://externals.io/message/77662#77678 · In reply to: #77666 > On Fri, Sep 26, 2014 at 1:29 PM, Florian Margaine > wrote: > > > […] > > see https://wiki.php.net/vcs/gitworkflow if a change affects multiple > branch we commit it to the lowest possible branch and merge it > upwards. there were a recent discussion about whether or not to change > this, as the current master (aka PHP7) has major changes which makes > the merge everything up strategy a lot more painful, but this > discussion didn't reached a consensus so there are no change in the > old workflow. But we really should fix this, as merging up is no fun right now. cheers, Derick --- ## #77680 — Andrey Andreev — 2014-09-26T15:36:35+00:00 URL: https://externals.io/message/77662#77680 · In reply to: #77678 > > > > […] > > But we really should fix this, as merging up is no fun right now. > > cheers, > Derick Hi, IMO, there's no point in trying to merge between two fairly different codebases. You could cherry-pick where appropriate, but this too will become harder while PHP7 development progresses. In a natural way, the two version trees become two separate efforts. My $0.02. Cheers, Andrey. --- ## #77682 — Stas Malyshev — 2014-09-26T17:25:37+00:00 URL: https://externals.io/message/77662#77682 · In reply to: #77662 Hi! > I had a discussion with another core dev who told me he did the opposite: > develop on PHP-5.5, then move the fix/feature up to the new branches (first > PHP-5.6, then master). If you talking about developing new features, you can not develop on 5.5 because 5.5 is a stable release that is closed for new features. So you should develop against master or, in rare cases you're sure your feature is small and self-contained enough to be included in 5.6, then against 5.6. If you're developing a bugfix, however, you should start with the version the bugfix is applied to, which may be 5.5. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/