Re: Re: Re: Tortoise 1.8 not show difference when merge

On 29 October 2013 11:51, Gergely Toth <gergelyk3_at_gmail.com> wrote:

> 1. I made the branch from my trunk.
> 2. I made changes on this branch.
> 3. I would merge back my branch into the trunk.
>
> For this operation I would use "Merge two different trees"
>

You can use "Merge two different trees" if you want to make trunk exactly
equal to the branch. If trunk has changed at all after you made the branch
then you are better merging the changes from the branch back into trunk
using "Merge a range of revisions". If you use the 2-tree merge then any
changes you made to trunk after the branch will be thrown away.

> I choosed on the merged different trees option on check outed trunk
> workspace with the following settings.
>
> From : My_Branch
> To: My trunk
> Working copy: My checkouted trunk
>

That is the problem. You need From:My trunk To: My_Branch

The manual explains why:
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-tree

But I would still recommend using the "range of revisions" in most cases.
Read the merge chapter to find out more.

> whan I click Merge. the SVN merged the branch into the trunk without
> conflicts. But I commit changes to the branch before.

Simon

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 14:05:28 CET