Working with SVN branches in Eclipse - Revision history

Oc666: /* Overview */ Fix broken link

2010-12-02T14:16:54Z

‎Overview: Fix broken link

Dextercowley: /* Creating a Branch */

2010-01-05T18:31:49Z

‎Creating a Branch

Dextercowley: add troubleshooting section

2010-01-05T18:26:00Z

add troubleshooting section

Dextercowley: getting subclipse

2010-01-05T03:52:50Z

getting subclipse

Dextercowley: instructions for working with branches with Eclipse

2010-01-05T00:52:43Z

instructions for working with branches with Eclipse

New page

{{inuse}}
This article provides step-by-step instructions for working with SVN branches using Eclipse and Subclipse (the Eclipse plug-in for Subversion).

== 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:
# Create a new branch on Joomlacode.
# Create an Eclipse project linked to the branch.
# Make program changes in your local Eclipse project and commit the changes back to the branch.
# As needed, merge changes from trunk into your branch.
# Finally, merge the branch back to trunk when the following conditions are met:
## The branch is up to date with trunk.
## 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 [[Setting_up_your_workstation_for_Joomla!_development | here]].

== 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 ==

[[Category:Development]]

← Older revision		Revision as of 18:31, 5 January 2010
Line 30:		Line 30:

	== Creating a Branch ==		== 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 ==		== Creating an Eclipse Project Linked to the Branch ==

@@ Line 1: / Line 1: @@
-{{inuse}}
+{{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.
@@ Line 36: / Line 36: @@
 == Committing Changes from the Branch back to Trunk ==
 [[Category:Development]]

@@ Line 3: / Line 3: @@
 == 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:
+The code for the latest stable Joomla! release is maintained in the SVN repository http://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:
 # Create a new branch on Joomlacode.
 # Create an Eclipse project linked to the branch.