[TxMt] Subversion and Merging?

[Eric Coleman]

i've been using subversion for about a year, but I haven't ever  
bothered with branches / merging.  It was always ok to just use trunk  
and we tagged releases...

Never had to take it any farther

Eric Coleman


On May 2, 2006, at 1:34 AM, Luke Daley wrote:

>
> On 02/05/2006, at 3:23 PM, Eric Coleman wrote:
>
>> I've read, and reread the svn book on branch / merging...
>>
>> And I still don't understand what im supposed to do.  I think I do  
>> this:
>>
>> 1) SVN Copy trunk to the new branch
>> 2) checkout the branch, remove all files
>> 3) put new files into branch, commit, etc
>> 4) Delete files in trunk, merge branch to trunk
>>
>> I somehow don't think that's right, but I honestly am not sure.
>>
>> Eric Coleman
>
> Are you coming from CVS?
>
> Luke Daley.
>
>
>
>
>
> ______________________________________________________________________
> For new threads USE THIS: textmate at lists.macromates.com
> (threading gets destroyed and the universe will collapse if you don't)
> http://lists.macromates.com/mailman/listinfo/textmate

-------------- 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/20060502/5e34e66f/attachment.p7s>