[TxMt] Subversion and Merging?

[Eric Coleman]

I know this doesn't belong here, but Im looking for some quick  
information:

I have the following structure:

branches/
tags/
trunk/

In my repository. Inside trunk is version 1 of our application. I  
want to start on 1.1 which is actually a major rewrite of almost  
everything.

So I create a 1.1 branch. and remove all files in the branch

Now, when I'm finished with the 1.1 branch, how do I merge it into  
trunk? can/do I just remove everything in trunk and merge the branch  
stuff down? The entire file structure is changing for version 1.1

Any insight would be appreciated :)

Eric Coleman


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3696 bytes
Desc: not available
URL: <http://lists.macromates.com/textmate/attachments/20060501/6e1bb20a/attachment.p7s>