Version control - Revision history

OBFusCATed at 20:13, 18 January 2012

2012-01-18T20:13:58Z

Alpha: SVN log entry style description.

2011-11-13T20:30:32Z

SVN log entry style description.

Jens: /* Merging from trunk to a branch */

2011-08-15T17:06:30Z

Merging from trunk to a branch

Jens: /* Merging from trunk to a branch */

2011-08-15T13:40:18Z

Merging from trunk to a branch

OBFusCATed: 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 ..."

2011-07-19T20:47:52Z

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 ..."

New page

[[Category:Code::Blocks Documentation]]
[[Category:Developer Documentation]]

==== 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 after (!) 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.

@@ Line 14: / Line 14: @@
 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.
 === SVN log entries ===
@@ Line 26: / Line 30: @@
   * compiler: allow multiple selection of directories for all operations (copy / delete / move...)

← Older revision		Revision as of 17:06, 15 August 2011
Line 16:		Line 16:
	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.
		+
		+
		+	'''Important note:'''
		+
		+	Never mix changes from a merge with pending changes from the branch. This will result in an immediate loss of the ability to do a SVN re-integrate merge as SVN will never be able to resolve the changes.

@@ Line 1: / Line 1: @@
 [[Category:Code::Blocks Documentation]]
 [[Category:Developer Documentation]]
 === Merging from trunk to a branch ===
 Merging from trunk to a branch is done with the following commands:
-    cd [path/to/my/branch/copy]
+ cd [path/to/my/branch/copy]
-    make sure it is clean and up to date
+ 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])
+ 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)"
+ 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.
@@ Line 16: / Line 14: @@
 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.