Working with SVN branches in Eclipse

Revision as of 22:52, 4 January 2010

This article is actively undergoing a major edit for a short while. As a courtesy, please do not edit this page while this message is displayed. The user who added this notice will be listed in the page history. This message is intended to help reduce edit conflicts; please remove it between editing sessions to allow others to edit the page. If this page has not been edited for several hours, please remove this template, or replace it with {{underconstruction}}.

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

Creating an Eclipse Project Linked to the Branch

Updating a Branch with Changes from Trunk

Committing Changes from the Branch back to Trunk