Also another sync to the debugger's branch will be handy, so I can test the fixes, too...
Morten, Jens can you do it?
(Jens, if you tell me the exact commands needed to do the merge, I won't bother you any more:) )
send those commands to me too please ;-)
This is how I do it on commandline in linux:
- cd [path/to/my/debugger-branch/copy]
- make sure it is clean and uptodate
- run: svn merge -r [first revision to be merged]:[last revision to be merged] svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk . (note the trailing dot [with a blank before it])
- commit changes with comment "* debugger_branch: merged with trunk (trunk to debugger_branch)"
The
first revision to be merged is normally the revision
after 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 debugger-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.
EDIT:corrected incorrect and dangerous instruction !