The Serendipity Handbook

You can now read the (german) handbook here: PDF - https://github.com/s9y/Book (LaTeX source).

Forum-Information

Before posting about errors, make sure that the answer cannot already be found in our FAQ or by searching this forum!
Posting is restricted to registered users (registering is free and simple!) due to recent spam attacks. When having trouble with this board, contact garvin(-at)s9y(-dot)org.

Board index Announcements Plugins moved to Github.com - CVS information

User avatar
garvinhicking
Core Developer
 
Posts: 29537
Joined: Tue Sep 16, 2003 9:45 pm
Location: Cologne, Germany

Postby garvinhicking » Tue Dec 13, 2011 3:13 pm

Hi!

For developers that contribute code to plugins or templates, currently on SourceForge.net CVS, please read:

http://blog.s9y.org/archives/237-Sparta ... -read.html

Best regards,
Garvin
# Garvin Hicking (s9y Developer)
# Did I help you? Consider making me happy: http://wishes.garv.in/
# or use my PayPal account "paypal {at} supergarv (dot) de"
# My "other" hobby: http://flickr.garv.in/

User avatar
Timbalu
Regular
 
Posts: 3896
Joined: Sun May 02, 2004 3:04 pm

Postby Timbalu » Fri Dec 23, 2011 5:18 pm

I'll try that in here... but please no offense taken about this, its Xmas! :wink:

Regarding the development in additional plugins the last week(s)
https://github.com/s9y/additional_plugi ... its/master
it might be good to talk about a using concept.

It looks like this Git repo is also used as some sort of development repo, which is not really good to have as an overview of developed plugin versions. It may be good to ask every developer to only paste real version updates here and develop the plugin on their own git repo, until it can be packed into here.

I know, normally each small update should also set the plugin version num.... but it does not look like it... What do you think?

Happy coding!
Ian
Regards,
Ian

User avatar
yellowled
Regular
 
Posts: 5647
Joined: Fri Jan 13, 2006 12:46 pm
Location: Eutin, Germany

Postby yellowled » Fri Dec 23, 2011 6:54 pm

Timbalu wrote:It may be good to ask every developer to only paste real version updates here and develop the plugin on their own git repo, until it can be packed into here.

This would mean extra work for plugin developers (I know what I'm talking about because I am actually doing it that way with 2k11), plus a lot of plugins don't even have a developer assigned.

What advantages do you see?

YL

User avatar
Timbalu
Regular
 
Posts: 3896
Joined: Sun May 02, 2004 3:04 pm

Postby Timbalu » Fri Dec 23, 2011 7:03 pm

> What advantages do you see?

Well, I do this too - nothing too bad in my opinion.
But to answer your question: cleanliness, as much as possible, as there is also this automated sync, which could just hit in between. ...

User avatar
garvinhicking
Core Developer
 
Posts: 29537
Joined: Tue Sep 16, 2003 9:45 pm
Location: Cologne, Germany

Postby garvinhicking » Fri Dec 23, 2011 7:58 pm

IMHO Grischa already bundles commits to a point where new testing makes sense. IMHO for me this is perfectly fine, every time you have tested some new features that you want people to try out and is basically working, it should be pushed to spartacus.

The basic guideline should be: Only push code into the repository that you feel people can test, and that has no known important bugs.

Regards,
Garvin
# Garvin Hicking (s9y Developer)
# Did I help you? Consider making me happy: http://wishes.garv.in/
# or use my PayPal account "paypal {at} supergarv (dot) de"
# My "other" hobby: http://flickr.garv.in/

User avatar
Timbalu
Regular
 
Posts: 3896
Joined: Sun May 02, 2004 3:04 pm

Postby Timbalu » Fri Dec 23, 2011 8:07 pm

[quote="garvinhicking"]The basic guideline should be: Only push code into the repository that you feel people can test, and that has no known important bugs.[/quote]

I'm perfectly fine with that, as I did not want to say more, nore blaming Grischas fine work here! ;-)

(this behaviour of restricted announced answers for normal users is bad, btw!)

User avatar
yellowled
Regular
 
Posts: 5647
Joined: Fri Jan 13, 2006 12:46 pm
Location: Eutin, Germany

Postby yellowled » Fri Dec 23, 2011 9:40 pm

Timbalu wrote:But to answer your question: cleanliness, as much as possible, as there is also this automated sync, which could just hit in between. ...

I'm not exactly comfortable with using them, but I think this is what (lokal) branches could be used for in git. (I'm also maintaining a seperate repo for 2k11 because I started it before we moved s9y to GitHub.)

YL

User avatar
blog.brockha.us
Regular
 
Posts: 695
Joined: Tue Jul 03, 2007 3:34 am
Location: Berlin, Germany

Postby blog.brockha.us » Sat Dec 31, 2011 3:26 pm

Yes. I'm only pushing "bundles of commits" to Spartacus, when I'm ready with local testing. I have (more than one) local feature git branches for checking in my changes. When ready with testing I rebase my feature branch on master (after pulling), merge them into master and push the new stuff. This produces a very clean history and pushes only when really ready.

Development branches should be local *only* in my opinion, as Spartacus is fetching and delivering any commited change.

There is a small exception: When I already did a feature push and have a small fix for this, I push this fix w/o increasing version number, when I know, Spartacus didn't fetch the plugins yet.

Else my feature pushs have a new version always.

To be able to work like this is the main benefit of git IMHO and I use this as often as I can.

User avatar
Timbalu
Regular
 
Posts: 3896
Joined: Sun May 02, 2004 3:04 pm

Postby Timbalu » Sat Dec 31, 2011 5:48 pm

blog.brockha.us:> Development branches should be local *only* in my opinion, as Spartacus is fetching and delivering any commited change.

I just thought about something different, using the master as the main development tree, but having a branch named spartacus which has this SF sync. We could even split that into an old and new smarty one, while switching to new template inheritance and {block}s features as had thought about in another thread.... or is that getting too much complicated?

User avatar
garvinhicking
Core Developer
 
Posts: 29537
Joined: Tue Sep 16, 2003 9:45 pm
Location: Cologne, Germany

Postby garvinhicking » Sat Dec 31, 2011 6:30 pm

Hi!

I just thought about something different, using the master as the main development tree, but having a branch named spartacus which has this SF sync. We could even split that into an old and new smarty one, while switching to new template inheritance and {block}s features as had thought about in another thread.... or is that getting too much complicated?


The other way around makes more sense. Let spartacus use the main trunk, and split off a branch with experimental features.

IMHO the mainly accessibly "trunk", be it plugins or the core, should always reflect the latest working code repository; completely experimental stuff should either only be local on the developer's machine (if he's working on it on his own), or it should be put inside a branch, from where it later is merged into trunk.
# Garvin Hicking (s9y Developer)
# Did I help you? Consider making me happy: http://wishes.garv.in/
# or use my PayPal account "paypal {at} supergarv (dot) de"
# My "other" hobby: http://flickr.garv.in/

User avatar
blog.brockha.us
Regular
 
Posts: 695
Joined: Tue Jul 03, 2007 3:34 am
Location: Berlin, Germany

Postby blog.brockha.us » Tue Jan 03, 2012 5:02 pm

I think the same as Garvin. master is the "natural" mirror of the remote branch, when you setup your git repo. So I leave master untouched always in development mode (to be able to pull from remote easily and have master in sync with remote always), only when I'm done with my feature, I merge in my feature branch and push master back to the remote repo (in the way I described before).

P.S.: Umh.. Can I rename my account? My name is Grischa, I don't know why I entered my blog name when registering.. :D

User avatar
onli
Regular
 
Posts: 1428
Joined: Tue Sep 09, 2008 10:04 pm

Postby onli » Fri Sep 28, 2012 8:24 pm

Do we still need this sticky? I fear that this thread maybe got as many clicks as it got because users thought it concerned them (like plugins moving away from spartacus).

Feel free to delete this post if you think we do.



Return to Announcements

Who is online

Users browsing this forum: No registered users and 0 guests