#include "boost/filesystem.hpp"
void Copy()
{
boost::filesystem::copy_directory("FooDir", "BarDir");
}
int main()
{
Copy();
return 0;
}
Fixed in rev7288. :)great job loaden!!!!! so Fast!!!
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:) )
This is how I do it on commandline in linux: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 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.
:oops: I found a serious error in my instructions two posts above :Absolutely true (I should have mentioned that, too)!
the first revision to be merged has to be the reviosion of last merge !!
Added to the wiki (http://wiki.codeblocks.org/index.php?title=Version_control#Merging_from_trunk_to_a_branch).:oops: I found a serious error in my instructions two posts above :Absolutely true (I should have mentioned that, too)!
the first revision to be merged has to be the reviosion of last merge !!
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.
Added to the wiki (http://wiki.codeblocks.org/index.php?title=Version_control#Merging_from_trunk_to_a_branch).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. ;-)
So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?For the merge use the revision of last merge (7386 at the moment, if I remember correctly) and HEAD.
Also what should be the revisions for the opposite merge, if I decide to test it?
So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.
Also what should be the revisions for the opposite merge, if I decide to test it?ALWAYS: Revision of branch creation until HEAD, and make sure you do a re-integrate merge.
ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.I'm confused again...
ALWAYS: Revision of branch creation until HEAD, and make sure you do a re-integrate merge.I don't want to commit, I just want to test what will happen :)
If you are talking about applying specific items - as you like, as long as you don't commit.
So, now what revision should I use to merge the debuggers branch (trunk to debugger_branch)?ALWAYS: Revision of latest merge from trunk + 1 (even in the case this applies to a different branch) to HEAD.
svn merge -r 7386:HEAD --dry-run svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk .
--- Merging r7387 through r7418 into 'src'
• -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.
That's not correct (at least on commandline) !I believe I am right, but probably some of us misunderstood. So lets see in pictures and by example, what I mean:
That's not correct (at least on commandline) !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?
svn merge -r 7386:HEAD --dry-run svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk .
--- Merging r7387 through r7418 into 'src'