Loading...
 

Work With Tiki As SVN Vendor

Lets say you want to use Tiki as a basis for creating your very own project (which nearly all of us developer/contractors do), it can get very difficult to manage things while working with a team to create the desired result, right? Subversion to the rescue!

Note: This assumes you are running linux, and that you have your own svn (subversion) server

Svn has a feature called "Vendor branches", you can read more about it here if you like. But here we are going to give you instructions on how to perform such an action.

Step 1

export the tiki version you'd like, I'll start with 7.x, since it is the latest to a directory called "tiki7.x". This may take some time... tiki is big ;).

svn export https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/7.x tiki7.x

Step 2

We want to create the repository that you will "vendor" from. Lets we'll call it "tiki7.x" inside parent folder "vendor". We can do this by creating the folders on our system, and then importing them into svn.

mkdir vendor
cd vendor
mkdir tiki7x
svn import -m "Creation of vendor folders" https://mysvnserver/vendor/

Step 3

Now we want to create our project folder, this is where we will do our work from. We will call it "my_project". Lets create the default folder structure for a standard svn project as well.

cd
mkdir my_project
cd my_project
mkdir tags
mkdir branches
mkdir trunk
svn import -m "Creation of project folders" https://mysvnserver/my_project

Step 4

Now we want to import what we exported from Step 1 back into our own svn server... This is going to take the most time of all the steps.

cd
cd tiki7.x
svn import -m "Vendor drop of tiki 7.x" https://mysvnserver/vendors/tiki7.x

Step 5

Now we copy the vendor folder to that of the project.

svn copy -m "Initial Copy of Tiki 7.x to project trunk" https://mysvnserver/vendors/tiki7.x https://mysvnserver/my_project/trunk


From here we can go ahead and checkout the project from the following url https://mysvnserver/my_project/trunk using our favorite svn client, or if you'd like to do it by cli:

svn checkout https://mysvnserver/my_project/trunk my_project


Now we need to address changed that are done in tiki than need updated back into the project.

Step 6

We want to basically do the same thing we did in Step 1, but this time, lets note the revision number. I added "-r33651" to the end of the folder for reference of the revision number (please use the correct revision number). This will create a directory called "tiki7.x-r33651" with the contents of the latest 7.x revision.

svn export https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/7.x tiki7.x-r33651

Step 7

Now we want to update the current version of tiki7.x with that of the latest revision by using svn's magical svn_load_dirs.pl. This will create a tag called "tiki7.x-r33651".

./svn_load_dirs.pl -t tiki7.x-r33651 https://mysvnserver/vendors tiki7.x tiki7.x-r33651

Step 8

Now lets merge changes locally, make sure to svn up.

svn merge  https://mysvnserver/vendors tiki7.x  https://mysvnserver/vendors/tiki7.x-r33651 tiki7.x-r33651

Step 9

Step 8 will probably product some conflicts, go ahead and fix those, then commit.

Step 10

Copy changes back to project

svn copy -m "Copy of Tiki 7.x r33651 to project trunk" https://mysvnserver/vendors/tiki7.x-r33651 https://mysvnserver/my_project/trunk
Page last modified on Wednesday 11 January, 2012 08:02:28 GMT-0000

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.

Accessibility (WAI & 508)
Accounting
Administration
Ajax
Articles & Submissions
Backlinks
Banner
Batch
BigBlueButton audio/video/chat/screensharing
Blog
Bookmark
Browser Compatibility
Calendar
Category
Chat
Comment
Communication Center
Consistency
Contacts Address book
Contact us
Content template
Contribution
Cookie
Copyright
Credits
Custom Home (and Group Home Page)
Database MySQL - MyISAM
Database MySQL - InnoDB
Date and Time
Debugger Console
Directory (of hyperlinks)
Documentation link from Tiki to doc.tiki.org (Help System)
Docs
DogFood
Draw
Dynamic Content
Preferences
Dynamic Variable
External Authentication
FAQ
Featured links
Feeds (RSS)
File Gallery
Forum
Friendship Network (Community)
Group
Help
History
Hotword
HTML Page
i18n (Multilingual, l10n, Babelfish)
Image Gallery
Import-Export
Install
Integrator
Interoperability
Inter-User Messages
InterTiki
jQuery
Kaltura video management
Karma
Live Support
Logs (system & action)
Lost edit protection
Mail-in
Map
Menu
Meta Tag
Missing features
Visual Mapping
Mobile
Mods
Modules
MultiTiki
MyTiki
Newsletter
Notepad
OS independence (Non-Linux, Windows/IIS, Mac, BSD)
Organic Groups (Self-managed Teams)
Packages
Payment
PDF
Performance Speed / Load / Compression / Cache
Permission
Poll
Profiles
Quiz
Rating
Realname
Report
Revision Approval
Scheduler
Score
Search engine optimization (SEO)
Search
Security
Semantic links
Share
Shopping Cart
Shoutbox
Site Identity
Slideshow
Smarty Template
Social Networking
Spam protection (Anti-bot CATPCHA)
Spellcheck
Spreadsheet
Staging and Approval
Stats
Survey
Syntax Highlighter (Codemirror)
Tablesorter
Tags
Task
Tell a Friend, alert + Social Bookmarking
Terms and Conditions
Theme
TikiTests
Timesheet
Token Access
Toolbar (Quicktags)
Tours
Trackers
TRIM
User Administration
User Files
User Menu
Watch
Webmail and Groupmail
WebServices
Wiki History, page rename, etc
Wiki plugins extends basic syntax
Wiki syntax text area, parser, etc
Wiki structure (book and table of content)
Workspace and perspectives
WYSIWTSN
WYSIWYCA
WYSIWYG
XMLRPC
XMPP




Useful Tools