Actions

Archived

Difference between revisions of "Development FAQ"

From Joomla! Documentation

(Merging a release back to the trunk)
Line 2: Line 2:
  
 
=== Merging a release back to the trunk===
 
=== Merging a release back to the trunk===
 +
[[:Category:NAME]]
  
 
Example of merging the 1.5 release back to the trunk:
 
Example of merging the 1.5 release back to the trunk:

Revision as of 05:26, 17 March 2008

Replacement filing cabinet.png
This page has been archived - Please Do Not Edit or Create Pages placed in this namespace. The pages in the Archived namespace exist only as a historical reference, it will not be improved and its content may be incomplete.

SVN

Merging a release back to the trunk

Category:NAME

Example of merging the 1.5 release back to the trunk:

svn merge http://joomlacode.org/svn/joomla/development/trunk@HEAD http://joomlacode.org/svn/joomla/development/releases/1.5@HEAD /Applications/MAMP/htdocs/joomla/trunk

The arguments are svn merge A B C where you want to change A in B and put it in C.

You may like to use the --dry-run option first just to test the command. Merging may take some time. It is a good idea to use the command line to perform this. If you are using Eclipse you will not be able to run this in the background.