Actions

Archived

Difference between revisions of "Development FAQ"

From Joomla! Documentation

Line 5: Line 5:
 
Example of merging the 1.5 release back to the trunk:
 
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
+
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.
 
The arguments are svn merge A B C where you want to change A in B and put it in C.
Line 11: Line 11:
 
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.
 
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.
  
 +
 +
See http://svnbook.red-bean.com/en/1.1/ch04.html for an explanation of the concepts behind branching and merging.
  
 
[[Category:Development]]
 
[[Category:Development]]

Revision as of 07:18, 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

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.


See http://svnbook.red-bean.com/en/1.1/ch04.html for an explanation of the concepts behind branching and merging.