RE: Re: Re: Problem merging changes from Branches to Trunk

So here's what I did.

1. Create a project repository with trunks, branches, tags folders.
2. Create project1 folder under trunk with 1 file called file1.txt
3. Create branch from folder1 under branches folder.
4. Modify line 1 on file1.txt under trunk. Commit.
5. Modify line2 on file1.txt under branches. Commit.

So the scenario is 2 developers working concurrently on trunk and branch
folder. Now the branch, let's say a feature branch that developer 1 is
working on, is ready to be merged back to trunk (being worked on by
developer 2.)

I thought the process would be, as it said in the manual, merging 2
trees. So...

1. I right click on the trunk/folder1 folder. Select Merge.
2. Enter the URL for trunk/folder1 in the FROM field, HEAD revision.
3. Uncheck "Use From URL..." checkbox and enter the branch URL in the TO
field (http... branches/folder1) HEAD revision.

When I do a dry run it says that the trunk/folder1/file1.txt is being
"updated". I would like to merge the changes between branches and trunk.

I know I'm doing something wrong here. Thanks for the help.

ramon

-----Original Message-----
From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
Sent: Thursday, January 10, 2008 2:34 AM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Re: Problem merging changes from Branches to Trunk

On 10/01/2008, Felipe, Ramon <ramon.felipe_at_wamu.net> wrote:
> 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.

No, I don't understand. Perhaps you would like to start your
description again. List the steps you do with the test repository,
what you expect to happen and what actually happens.

Simon

> -----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
>
>

-- 
       ___
  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