Skip to main content

This site requires you to update your browser. Your browsing experience maybe affected by not having the most up to date version.

Archive /

Our old forums are still available as a read-only archive.

Moderators: martimiz, Sean, biapar, Willr, Ingo, simon_w

Merging branches/gsoc->trunk


Reply


2 Posts   1327 Views

Avatar
Ingo

Forum Moderator, 801 Posts

22 September 2007 at 3:17am

as mentioned by siggy in a [url="http://www.silverstripe.com/google-code-on-its-way/"]blog-post[/url], we've merged most of the gsoc-commits into trunk. before merging, we branched off the pre-gsoc trunk to branches/2.1.0, which will be used to form the current release candidates.

the "daily build"-checkout mentioned on our [url="http://www.silverstripe.com/silverstripe-web-application-framework/"]downloads-page[/url] was switched to use branches/2.1.0.

if you want to checkout the "bleeding-edge" trunk to confirm your commits where merged in correctly, please use the following svn:externals:

sapphire/ svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
cms/ svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk
jsparty/ svn://svn.silverstripe.com/silverstripe/open/modules/jsparty/trunk
ssopen/ svn://svn.silverstripe.com/silverstripe/modules/ssopen/trunk

so far i've only reviewed code that was committed to sapphire/cms/jsparty, you might have received some trac-tickets with questions or comments in http://trac.silverstripe.com/gsoc.

the currently merged revisions are:
* sapphire: 41069
* cms: 41070
* jsparty: 40450

apart from some inconsistencies with following coding conventions, 99% of the code produced during GSOC was of really high quality, and found its way into the core - so congrats to all your hard work! :-)

for any further development, please make sure to review our coding conventions at http://doc.silverstripe.com/doku.php?id=coding-conventions, and let us know where we can improve here. those conventions are pretty recent, so some of our own code doesn't follow it either, but we try to get at least all newly producded code adhereing to it.

Avatar
Ingo

Forum Moderator, 801 Posts

1 October 2007 at 11:39am

moved any status updates on merged revisions from the gsoc-branch to the wiki: http://support.silverstripe.com/gsoc/wiki/GSocMergeStatus
(only accessible to ss-staff and gsocers, everybody else can just view the public revision-log on http://open.silverstripe.com)