Textpattern CMS support forum
You are not logged in. Register | Login | Help
- Topics: Active | Unanswered
Offline
Re: Textpattern's ongoing development
gaekwad wrote #342169:
calling it
4.9.xor something similar makes it clear of its purpose.
Makes sense. I was thinking each rev would get its own branch and we’d delete the old one but, for continuity sake and less faff with scripts, you’re right that it makes sense to use a generic name.
Anyone fancy taking a stab at renaming a branch can do so from GitHub, but that has ramifications for people whom have cloned already when syncing, as outlined in the link above.
So maybe the better option is to do it at the command line:
git checkout v4.9.1
git pull
git branch 4.9.x
(change any file superficially like History.txt)
git commit
git push -u origin 4.9.x
git branch -D v4.9.1
git push origin --delete v4.9.1Something like that ought to do it.
The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.
Hire Txp Builders – finely-crafted code, design and Txp
Offline
Re: Textpattern's ongoing development
gaekwad wrote #342172:
This should also be considered for the other project repos, too – themes, docs (which is a whole other thing that needs unpacked), and toolbelt scripts off the top of my head.
Yes. Let’s make 4.9.x branches for all these projects too.
The checksums toolbelt script for the new 5.0.0 dev needs to reflect the change to TXPINTERFACE, for example. There will be others.
The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.
Hire Txp Builders – finely-crafted code, design and Txp
Offline
Re: Textpattern's ongoing development
Bloke wrote #342175:
Makes sense. I was thinking each rev would get its own branch and we’d delete the old one but, for continuity sake and less faff with scripts, you’re right that it makes sense to use a generic name.
Prior to today, we used dev and published a tag for each release, so a similar workflow would work just fine: use 4.9.x in place of dev for the v4.9 releases, and tweak the toolbelt script so it uses the correct branch.
My gut feeling is that we need to spec this split out a bit more before we commit to it as it has knock-on effects with the other repos as well as downstream cloners. Would you be open to a bit more discussion, Bloke?
Offline
Re: Textpattern's ongoing development
Bloke wrote #342175:
Anyone fancy taking a stab at renaming a branch can do so from GitHub, but that has ramifications for people whom have cloned already when syncing, as outlined in the link above.
According to this the 4.9.1 branch is 425 commits behind dev, which seems high…does that make sense to you, Bloke?
Edit: actually, it looks like the custom-fields stuff folded in accounts the commits. Ignore the above
Last edited by gaekwad (Yesterday 22:26:41)
Offline
Re: Textpattern's ongoing development
The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.
Hire Txp Builders – finely-crafted code, design and Txp
Offline