Difference between revisions of "Version control"

From CodeBlocks
Jump to: navigation, search
(Created page with "Category:Code::Blocks Documentation Category:Developer Documentation ==== Merging from trunk to a branch ==== Merging from trunk to a branch is done with the following ...")
 
(Merging from trunk to a branch)
Line 12: Line 12:
  
  
The first revision to be merged is normally the revision after (!) the last merge, the last revision to be merged is normally HEAD, the url has to be fixed to fit your needs.
+
The first revision to be merged is normally the revision of the last merge, the last revision to be merged is normally HEAD, the url has to be fixed to fit your needs.
 
Instead of the url you can use the root-folder of your working-copy of trunk.
 
Instead of the url you can use the root-folder of your working-copy of trunk.
 
Instead of the trailing dot you can use the path to your working copy of the my-branch (if you are not inside its root-folder).
 
Instead of the trailing dot you can use the path to your working copy of the my-branch (if you are not inside its root-folder).
 
To see what will be merged (instead of really doing it), you can use "--dry-run" as for many other svn commands.
 
To see what will be merged (instead of really doing it), you can use "--dry-run" as for many other svn commands.

Revision as of 15:40, 15 August 2011


Merging from trunk to a branch

Merging from trunk to a branch is done with the following commands:

   cd [path/to/my/branch/copy]
   make sure it is clean and up to date
   run: svn merge -r [first revision to be merged]:[last revision to be merged] svn+ssh://yourlogin@svn.berlios.de/svnroot/repos/codeblocks/trunk . (note the trailing dot [with a blank before it])
   commit changes with comment "* my_branch: merged with trunk (trunk to my_branch)"


The first revision to be merged is normally the revision of the last merge, the last revision to be merged is normally HEAD, the url has to be fixed to fit your needs. Instead of the url you can use the root-folder of your working-copy of trunk. Instead of the trailing dot you can use the path to your working copy of the my-branch (if you are not inside its root-folder). To see what will be merged (instead of really doing it), you can use "--dry-run" as for many other svn commands.