Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
CC makes cb hang
Jenna:
--- Quote from: MortenMacFly on August 25, 2011, 12:14:05 pm ---
--- 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?
--- End quote ---
This would work (on commandline) in this case, because the revision you use as first revision is not a revision of trunk.
As posted before, the merge command uses the changes between the first revision and first revision + 1 up to the changes in HEAD for merging:
--- Quote from: jens on August 25, 2011, 10:41:05 am ---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 ---
It might be that SmartSVN is so smart, that it hides that from a user and does it in a more logical way (in my eyes) and use also the changes in the first given revision for merge.
But that's obviously not the way svn behaves on commandline, as the output from my dry-run shows clearly.
Navigation
[0] Message Index
[*] Previous page
Go to full version