Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
CC makes cb hang
killerbot:
--- Quote from: oBFusCATed on July 19, 2011, 02:30:55 pm ---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:) )
--- End quote ---
send those commands to me too please ;-)
Jenna:
--- Quote from: killerbot on July 19, 2011, 03:48:49 pm ---
--- Quote from: oBFusCATed on July 19, 2011, 02:30:55 pm ---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:) )
--- End quote ---
send those commands to me too please ;-)
--- End quote ---
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 !
oBFusCATed:
Thanks a lot Jens,
I've added this precious info to the wiki -> http://wiki.codeblocks.org/index.php?title=Version_control
Jenna:
:oops: I found a serious error in my instructions two posts above :
the first revision to be merged has to be the reviosion of last merge !!
This means all my merges (and the merges done by others with this instruction) are most likely incorrect !!
I will check them all and try to correct them !
Exactly I check all merges done by me, oBFusCATed and killerbot.
Jenna:
--- Quote from: jens on August 15, 2011, 02:50:27 pm ---This means all my merges (and the merges done by others with this instruction) are most likely incorrect !!
I will check them all and try to correct them !
Exactly I check all merges done by me, oBFusCATed and killerbot.
--- End quote ---
Seems like only four files have been involved.
Should be fixed now.
Sorry for the inconvenience.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version