[dev] Branching thoughts

ralf.lang at ralf-lang.de ralf.lang at ralf-lang.de
Wed Oct 25 15:31:19 UTC 2023


Quoting Michael J Rubinsky <mrubinsk at horde.org>:

> Quoting Ralf Lang <ralf.lang at ralf-lang.de>:
>
>> Hello,
>>
>> I thought a little about how to transition without breaking  
>> everybody's stuff.
>> It's handy that the branch name "master" is not very popular these  
>> days anyway.
>>
>> I will try to import all relevant developments from "master" into  
>> the "FRAMEWORK_6" branch of each repo.
>> FRAMEWORK_6 will contain all the fixes needed to eventually create  
>> tagged, php 8 to 8.2 compatible releases that end up on packagist.  
>> Including breaking changes as long as it's alpha.
>
> I would normally advocate for doing this development on master/main,  
> but I agree that are probably too many git installs running in the  
> wild to make this feasible. This feels like the most responsible  
> approach here.
>

That's exactly the problem I try to avoid here. Let's not break the  
git-tools installs but the FRAMEWORK_6 stuff has evolved so far off  
master especially thinking about sabre/dav, composer and other fixes.

Once FRAMEWORK_6 is actually a stable release we will need a proper  
"main" (or whatever it is called) branch but currently it's academic.

BTW, you can now do

  composer create-project horde/bundle .

to create a horde base project. It will still error when trying to  
pull its further dependencies but it will tell us what is the latest  
bit it is lacking.

@mrubinsk do you have a packagist account?

Regards

Ralf


More information about the dev mailing list