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

When I tried this, the change in the trunk gets over written by the
changes between the branch revisions. I failed to mention that the trunk
has also been updated and I need the 2 trees (branch and trunk) to
merge.

I posted the steps I took on this mailing list. Thanks for your help.

Ramon

-----Original Message-----
From: Hielke Hoeve [mailto:hielke.hoeve_at_gmail.com]
Sent: Thursday, January 10, 2008 4:04 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:
> 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.

Then this is wrong. When I merge changes made on branch A between
revision 1 and (say) 7 to branch B I do the following.

1. Select Merge on the folder containing branch B.
2. From URL: Branch A, revision 1.
3. TO URL: Branch A, revision 7.
4. Merge.

The folder containing branch B will have all the differences between
Branch B latest revision and Branch A revisions 1 through 7.

You can also do this for a complete branch to another branch. You then
choose From revision 1 through HEAD, or lookup the actual first and
last revision numbers and use that.

Hielke

---------------------------------------------------------------------
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
Received on 2008-01-10 19:57:13 CET