Working with SVN branches in Eclipse

Revision as of 13:31, 5 January 2010

This article or section is in the process of an expansion or major restructuring. You are welcome to assist in its construction by editing it as well. If this article or section has not been edited in several days, please remove this template. This article was last edited by Dextercowley (talk| contribs) 3 years ago. (Purge)

This article provides step-by-step instructions for working with SVN branches using Eclipse and Subclipse (the Eclipse plug-in for Subversion). The screenshots for this article were made using the latest 3.5 Eclipse version (Galileo). The screen contents for other Eclipse version may be somewhat different. It is important to have Subclipse version 1.6 (or later) for merging branches. This version greatly simplifies merging, since it keeps track of previously merged revisions automatically. If you are using an older version of Subclipse, it is strongly recommended that you update to version 1.6.

Overview

The code for the latest stable Joomla! release is maintained in the SVN repository https://joomlacode.org/svn/joomla/development/trunk. To keep this version stable, new feature development should be done in SVN branches. A branch is a copy of the trunk at a point in time. The basic steps for working with a branch are as follows:

1. Create a new branch on Joomlacode.
2. Create an Eclipse project linked to the branch.
3. Make program changes in your local Eclipse project and commit the changes back to the branch.
4. As needed, merge changes from trunk into your branch.
5. Finally, merge the branch back to trunk when the following conditions are met:
   1. The branch is up to date with trunk.
   2. The branch is stable.

Note that steps 3 and 4 above can be done as many times as needed.

Getting Eclipse and Subclipse

Detailed instructions for installing Eclipse and Subclipse are available here. If you already have Eclipse installed and just need to update the Subclipse, follow these steps.

1. In Eclipse, navigate to Help → Install New Software. The screen below will show.

Press the Add button and add the Subclipse 1.6 update site "http://subclipse.tigris.org/update_1.6.x" as shown below:

Select the new update site in the "Work with" drop-down. Then select Optional JNA Library and Subclipse, as shown below.

Press Next and complete the wizard. You will be prompted to restart Eclipse to finish the installation. At this point, you should have the Subclipse 1.6 client software installed.

Creating a Branch

Note: As of January 5, 2010, only people with special permissions are allowed to create new branches in the Joomlacode SVN. This is expected to change soon so that any registered user who signs a Contributor License Agreement (CLA) can create and work with branches. Until then, contact a Joomla! Development Coordinator to request that a branch be created for you.

Creating an Eclipse Project Linked to the Branch

Updating a Branch with Changes from Trunk

Committing Changes from the Branch back to Trunk

Troubleshooting