Changes between Version 8 and Version 9 of SVN

Timestamp:

Dec 13, 2006, 10:19:26 AM (17 years ago)

Author:

Frederico Caldeira Knabben

Comment:

--

SVN

@@ -4 +4 @@
 http://tools.assembla.com/svn/fckeditor
 
-To browse the SVN source the [http://tools.assembla.com/fckeditor/browser Browse Source] button in the toolbar offers a much better interface.
-
+To browse the SVN source the [http://tools.assembla.com/fckeditor/browser Browse Source] button in the Trac site toolbar offers a much better interface.
 
 == Repository Structure ==
@@ -33 +32 @@
 === Branches ===
 
-Branch give us isolated environments for development, and once tested and confirmed a new work is ready, it can be simply merged in the trunk.
+Branches give us isolated environments for development, and once tested and confirmed a new work is ready, it can be simply merged in the trunk.
 
 The branches could be created in the following spaces:
@@ -40 +39 @@
  * '''branches/features''': if a feature is too big and complex, a developer could decide to create a dedicated branch for it.
  * '''branches/versions''': there could be branches for future versions, waiting while previous ones are being tested and released.
+
+==== Merging Branches ====
+
+A common task during a branch development, is to '''merge changes made in the trunk to the branch''', leaving it always up to date with the trunk. Remember that merges must be done from the last revision merged, starting from the revision from which the branch has been created.
+
+When '''merging branches to the trunk''', first merge the trunk to the branch and check that everything is ok. Make the necessary changes and commit the branch. Then switch to the trunk and merge the differences between the branch HEAD and the last trunk revision you have just merged to the branch (usually HEAD). 
+
+If you are insecure, don't be afraid of asking others to execute this task for you.
+
+TortoiseSVN offers a nice tool to track the creation an life-cicle of branches. It is called "Revision graph". The SVN log can also be used for it.
 
 === Tags ===