[1.6][2.0] How to submit changes?

[yellowled]

I have to ask this every single time I get back into core changes after a while (and yes, I know it is annoying after all this time -- sorry about that ): How are we supposed to submit changes to the respective versions? Also, some random thoughts on the whole maintenance process in general:

1. Changes for 1.6 go into trunk, right? There's no branch for 1.6 yet, or do we commit those to the 1.5 branch as well? What about changes for 2.0 (or: whenever)?

2. What about new frontend/backend templates? We probably do not want to put those on spartacus before they're finished, but do we want them in svn yet? Should Don and I just get a seperate repo for those?

3. How about changes in additional plugins related to changes in the core? Do we need seperate repos for "plugins for 2.0" (at some point)?

4. Shouldn't we also think about switching from cvs/svn to git at some point? Maybe 2.0 is a good starting point, we could start 2.0 development with a repo on GitHub and add plugins later? (Yes, Garvin, I know you're not familiar with git yet. )

YL

[Timbalu]

I know, its merely a question for Garvin, but yes, yes, yes, yes!

The point not having those, is that Serendipity is trying to be backward compatible as much as possible.
But since I tried to get clear with that smarty3 thing, I really do think we need a branch to break with some backward compats. And I want to play with new templates!

Ian

[garvinhicking]

Hi!

1. Yes. 2.0 was an experimental branch with not much code changes yet. Everything that is "supposed to work" and does nto introduce groundbreaking incompatible behavior can go into 1.6.

2. Feel free to check them into SVN or CVS, whatever pleases you more. Having them available in our current distro would be nice. If you prefer github for working on those, feel free to do that, and simply share links here on the forums...

3. I'd like to add code for that into existing plugins. We can use s9y version checks to introduce new core code. I'd like to avoid branching plugin development.

4. I'm currently thinking about this. I hesitate because of the hassle for adapting scripts and needing some time to work into git. My Leidensdruck is not high enough yet. Also, github has some centralization issues because and I'd like to have a larger company or group stay behind our public infrastructure. I'm really not sure on this yet, but I'm also not against it either.

Regards,
Garvin

[yellowled]

2. Feel free to check them into SVN or CVS, whatever pleases you more.

I guess we'll just use svn then. I still don't really trust the sourceforge cvs server ...

3. I'd like to add code for that into existing plugins. We can use s9y version checks to introduce new core code. I'd like to avoid branching plugin development.

Okay, this doesn't really concern me anyway since I don't plan on becoming a plugin developer.

4. I'm currently thinking about this.

Yeah, we already talked about that in private, I just thought it would be a good idea to document it here.

YL

[Timbalu]

my GIT pro URL storm:

PHP-Projekt verwendet künftig Git
http://www.golem.de/1109/86309.html

http://de.whygitisbetterthanx.com/ (de)
http://progit.org/ (en)

[Timbalu]

BerliOS wird am 31.12.2011 wegen mangelnder Finanzierung schließen.

http://developer.berlios.de/forum/forum ... m_id=37450

hmmm, wenn das stimmt sollte Garvin eventuell seine Oktoberferien anders nutzen...

[yellowled]

In English, please!

http://developer.berlios.de/forum/forum ... m_id=37450

Yes, it is true, berlios (home of the s9y svn repo) is closing down at the end of 2011.

Garvin and I are already on moving the repo to GitHub. If anyone has actual experience with converting a svn repo to git, please step up – it is kind of tricky, especially with a rather big repo using tags and branches, so every help is widely appreciated.

YL