RE: Re: Problem merging changes from Branches to Trunk

Thanks for the reply.

I've read the manual but according to the manual, when branching between
2 trees, the TO and FROM must contain the 2 trees I'm merging. The
manual says that the FROM field should be the trunk URL and the TO field
should contain the branch URL.

When I tried your suggestion it is merging between the 2 branch
revisions instead of the trunk. I hope this makes sense.

-----Original Message-----
From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
Sent: Wednesday, January 09, 2008 3:37 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Problem merging changes from Branches to Trunk

On 09/01/2008, Felipe, Ramon <ramon.felipe_at_wamu.net> wrote:
> When I merge my Branch to the Trunk the files on the trunk are getting
> overwritten. It is doing an "update" instead of "merging" the file
changes.
>
> To make sure it has nothing to do with my existing revisions and
working
> copies, I create a clean repository from scratch just to test. And
sure
> enough it is updating the trunk instead of merging.
>
> I tried googling this and searching forums with no luck, which is
> surprising. Any help is appreciated.

Almost certainly this is because you are doing the merge incorrectly.

The From: location should be the branch URL and the revision should be
the one before the first revision you want to merge.

The To: location should also be the branch URL (use same URL checkbox)
and the revision should be the last one you want to merge.

Please read the manual again to find out how merging works.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org