Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
CC makes cb hang
Jenna:
--- Quote from: oBFusCATed on August 24, 2011, 09:08:07 pm ---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?
--- End quote ---
For the merge use the revision of last merge (7386 at the moment, if I remember correctly) and HEAD.
MortenMacFly:
--- Quote from: oBFusCATed on August 24, 2011, 09:08:07 pm ---So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?
--- End quote ---
ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.
--- Quote from: oBFusCATed on August 24, 2011, 09:08:07 pm ---Also what should be the revisions for the opposite merge, if I decide to test it?
--- End quote ---
ALWAYS: Revision of branch creation until HEAD, and make sure you do a re-integrate merge.
If you are talking about applying specific items - as you like, as long as you don't commit.
oBFusCATed:
--- Quote from: MortenMacFly on August 25, 2011, 09:23:54 am ---ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.
--- End quote ---
I'm confused again...
I've used the revision, which has commit message '* debugger_branch: merged with trunk (trunk to debugger_branch); fix files not correctly merged due to an incorrect use of "svn merge" (shame on me)'
--- Quote from: MortenMacFly on August 25, 2011, 09:23:54 am ---ALWAYS: Revision of branch creation until HEAD, and make sure you do a re-integrate merge.
If you are talking about applying specific items - as you like, as long as you don't commit.
--- End quote ---
I don't want to commit, I just want to test what will happen :)
Jenna:
--- Quote from: MortenMacFly on August 25, 2011, 09:23:54 am ---
--- Quote from: oBFusCATed on August 24, 2011, 09:08:07 pm ---So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?
--- End quote ---
ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.
--- End quote ---
That's not correct (at least on commandline) !
The first revision has to be the revision of last merge !!
It has worked before (in most cases), because a merge with the wxSmith-branch was made directly after the debugger-branch merge, so no changes to trunk have been lost.
--- Quote ---svn merge -r 7386:HEAD --dry-run svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk .
--- Merging r7387 through r7418 into 'src'
--- End quote ---
Svn merges the changes that are made between the first given revision and the last given revision !
--- Quote from: http://www.informit.com/store/product.aspx?isbn=0131855182 ---• -r --revision] arg
Give the two revisions to be merged between, in the form -r N:M, where N is the
older revision and M is the newer revision. The revision numbers can be reversed to
reverse the merge direction.
--- End quote ---
MortenMacFly:
--- Quote from: jens on August 25, 2011, 10:41:05 am ---That's not correct (at least on commandline) !
--- End quote ---
I believe I am right, but probably some of us misunderstood. So lets see in pictures and by example, what I mean:
In the image you see a snapshot of CC's repo. Let's assume, 7392 is the latest revision.
If I would like to merge from trunk to wxSmith, I would choose: r7388-HEAD
If I would like to merge from trunk to Debugger, I would choose: r7387-HEAD
That's what I meant and this should pretty much be correct - at least that works on my personal repositories very well (even the re-integrate merge worked flawlessly).
Do you agree on that?
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version