[TxMt] Subversion and Merging?

[Sune Foldager]

On 02/05/2006, at 19:24, Chris Thomas wrote:

> The question is how comprehensive the changes are; if there's  
> really _no_ sharing and no history between the two versions, Eric  
> probably wants to do what Sune said if he wants the new code to be  
> the trunk:
>
>> But really, why not do this:
>> 1) Delete trunk.
>> 2) Move in new files.
>> 3) Commit.
>
> It's the simplest option for the scenario where literally  
> _everything_ is different, from the ground up. But it's not usually  
> what you want to do, because it doesn't preserve the history of the  
> files.

Right... it's only for this rather special scenario. To the OP: I  
would add a step 0.5) Copy trunk to a tag or branch (in svn, there is  
no real difference; only what you read into it), to make sure you can  
still do patches to it etc.

-- Sune.