Serendipity Forums

Now that 1.7 is out, how to we manage GitHub branches?

1. I'm all for deleting unused branches, but since 1.6.x is the last branch that will work with PHP < 5.2, should we keep it around in case we need to add security fixes and do a 1.6.4? Should we set an “end of life” date for 1.6.x or do we just support it as long as possible?

2. Don't we need a 1.7 branch for future minor releases? Or do we just work in master until 2.0 and master are being merged?

YL

Hi!

I am for:

- Leaving 1.6 branch in github until 2.0 is released
- Once 2.0 is in a "working" state (javascript all edited, the new admin template in a "beta" state) we will put 2.0 into trunk, and then remove the 2.0 branch.
- Until 2.0 is not merged, the current trunk will be our 1.7 branch; this way we don't need to have yet another branch to maintain the code.

Regards,
Garvin

Dito! (About the 1.6 branch, we could even stick a little bit longer, since it does not hurt...)

Fine by me. Let's also try and not mix up svn/git terminology any longer – git doesn't have trunk, that's master.

I can not estimate where we are on the JS rewrite, maybe onli can say more about that.

We might even want to call another mumble devsprint soon to catch everybody up on what onli and I have been doing in the 2.0 backend?

YL

yellowled wrote:I can not estimate where we are on the JS rewrite, maybe onli can say more about that.

Pretty much done, as far as I remember. Though it is possible I forget an area right now I marked as "work for later" (movable plugins probably). Haven't worked on that for a while - but i know the js-delivery-mechanism was in place and the js for mediadb and editor rewritten (old mediadb, the new concept wasn't used yet).

yellowled wrote:We might even want to call another mumble devsprint soon to catch everybody up on what onli and I have been doing in the 2.0 backend?

Agreed.

onli wrote:Pretty much done, as far as I remember.

That can't be true. Or I have really lost track of what we did there.

YL

Possible I mix things up... Like I said, some areas were untouched. We'll have to do an inventory^^ (and laugh afterwards how wrong that statement was).