[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Issue With Merge

From: Daniel Atallah <daniel.atallah_at_gmail.com>
Date: Mon, 27 Sep 2010 18:21:42 -0400

On Mon, Sep 27, 2010 at 15:22, Ira Williamson <ira_at_qqest.com> wrote:
> I am trying to merge a Branch into a Trunk
>
> The Merge feature has been working in the past but just recently any time anyone on our team tries to merge changes from a branch into the trunk the same two files come up as needing to be merged, no matter what files have been changed in the Branch. It has been verified that files are the same between the Trunk and the Branch.
>
> Steps we follow to merge a branch to a trunk.
>
> We Right click on the trunk dir and select. TortoiseSVN>Merge
> Select "Merge two different trees" as the Merge type.

This is probably not what you want to do - you either want to "Merge a
range of revisions" (if you're not using SVN 1.5 merge tracking), or
"Reintegrate a branch" (if you are using merge tracking).

> Select "Next"
> Select the branch dir and HEAD Revision for the "From: (startURL and revision of the range to merge)"
> Select the trunk dir and HEAD Revision for the "To: (end URL and revision of the range to merge)"

Again, this probably isn't what you want to do - to merge your branch
to the trunk, both the "From" and "To" will be your branch and the
revisions will be the first revision of the branch and the HEAD of the
branch.

If you had chosen the appropriate "Merge type" the complexity would
have been hidden from you (you would only have one branch to choose
where to merge from).

I suggest that you read the merging section in the SVN book carefully
- this stuff will make sense if you understand what merging actually
does.

-D

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2665475

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-28 00:22:01 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.