Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
CC makes cb hang
MortenMacFly:
--- Quote from: jens on August 15, 2011, 02:50:27 pm ---: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 !!
--- End quote ---
Absolutely true (I should have mentioned that, too)!
Could you do me a favour and also add the note I sent to you and oBFusCATed as PM? This is also very important. That basically screwed out last re-integrate merge. As I see more and more devs doing merges (which is OK) I think it is important to all. I didn't find the PM in my outbox though.
Jenna:
--- Quote from: MortenMacFly on August 15, 2011, 04:46:43 pm ---
--- Quote from: jens on August 15, 2011, 02:50:27 pm ---: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 !!
--- End quote ---
Absolutely true (I should have mentioned that, too)!
Could you do me a favour and also add the note I sent to you and oBFusCATed as PM? This is also very important. That basically screwed out last re-integrate merge. As I see more and more devs doing merges (which is OK) I think it is important to all. I didn't find the PM in my outbox though.
--- End quote ---
Added to the wiki.
MortenMacFly:
--- Quote from: jens on August 15, 2011, 07:07:16 pm ---Added to the wiki.
--- End quote ---
Thank you. :D BTW: Reading the article clearly makes me happy that I am using a front-end (SmartSVN in my case) which makes things way easier and less error-prone. So, my suggestion would be: If unsure, don't use the command line but use the knowledge of experts and use a front end. ;-)
BTW: SmartSVN is by far the best front-end I found. It's commercial (unfortunately), but there is a free foundation edition. However, a lot features come with the commercial license (which I own). For example: The whole branch / tag / integrate stuff is totally simplified and e.g. with a graphical branch visualisation.
Also very nice: Their SmartGIT client, coming with full SVN support in the next version. So grabbing / synchronising a GIT tree out of/into our SVN repo will be easy. And no, I am not getting paid by Syntevo, but I believe it's a really good piece of software.
oBFusCATed:
In the beginning of the debugger branch, I was using git-svn (or something like that).
In the end it turned out that it doesn't support the useless (in my opinion) rev/author/date tags.
Thus generating a patch was impossible and I had to use dir-diff to generate the patches.
So Morten before using SmartGIT, check if it supports this tags.
Also if be more branch-friendly in the future, we should switch to git/hg/something fashionable, where merging is no problem!
The smart client won't fix the problem, it will make it show less often.
p.s. the debuggers branch is the only time I've used git (never used hg or something else), so I can't say if we should/must switch.
oBFusCATed:
So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?
Also what should be the revisions for the opposite merge, if I decide to test it?
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version