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.

We've moved the forum!

Please use forum.silverstripe.org for any new questions (announcement).
The forum archive will stick around, but will be read only.

You can also use our Slack channel or StackOverflow to ask for help.
Check out our community overview for more options to contribute.

Archive /

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

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

Merging of GSOC-branches


Go to End


1405 Views

Avatar
Ingo

Forum Moderator, 801 Posts

14 September 2007 at 11:31am

we're finally getting around to merge all the awesome stuff that has been isolated in the gsoc-branches. while most of it won't make it into the next release already, it will be available through the silverstripe-trunk for sapphire/cms/jsparty.

based on the method on which we're merging (granular merge author-by-author),
trunk will be unstable (or at least inconsistent) for a couple of days.

IMPORTANT:
if you've been checking out anything from svn://svn.silverstripe.com/silverstripe/open,
make sure you're using the 2.1.0 branches instead of trunk.

the phpinstaller mentioned on the download-page is already switched to 2.1.0 - you can update your working copy by using "svn update ." in the root-directory.

note: when referring to "2.1.0", we're meaning a codebase that will eventually form the release candidates for the 2.1.0 release - it's not fully there yet ;)