I didn’t setup my svn in the standard way. Standard convention would say it looks something like this:

projecta/trunk/src
projecta/trunk/docs
projecta/branch/betabranch/src
projecta/branch/betabranch/docs

As I have previously posted, I don’t like the tools dictating how I should setup my source tree. So I have:

projecta/src
projecta/docs
projectb/src
projectb/docs

etc… projecta and project b interact with other (one is libraries).

but now I need a branch. So what I did was create a “branch” project for my “betabranch”.

mkdir -p branch/betabranch
svn import branch http://somehere/svn/branch

So now I can easily branch the code with

svn copy http://somewhere/svn/projecta http://somewhere/svn/branch/betabanch/projecta

I haven’t done the merge yet, so I might be in for some pain. We will see..

Cameron

Leave a Reply