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

Re: Merge two different trees menu ignores conflicts.

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Wed, 6 Aug 2014 14:57:04 +0100

On 6 August 2014 03:03, Hiroshi YOSHIKAWA <h.yoshikawa_at_kako.co.jp> wrote:
> [what you did]
> 1. I made branch [func2] from a trunk.
>
> 2. I edited a.txt in trunk working folder
> -- before
> 1.trunk1 modified by trunk
> 2.trunk2 modified by trunk
> 3.trunk3
> -- after
> 1.trunk1 modified by trunk
> 2.trunk2 modified by trunk23
> 3.trunk3
> --
> and committed the working folder.
>
> 3. I edited a.txt in branch [func2] working folder.
> -- after
> 1.trunk1 modified by trunk
> 2.trunk2 modified by func2
> 3.trunk3
> --
> and committed the working folder.
>
> 4.from trunk working folder I executed [Merge two different trees] menu.
> (From = trunk, To = branches/func2)
>
> [what you wanted to happen]
> I expected a.txt will be conflicted and TortoiseSVN
> notify me.
>
> [what actually happened]
> a.txt became follows.
> --
> 1.trunk1 modified by trunk
> 2.trunk2 modified by func2
> 3.trunk3

You used the wrong merging model. In order to get what you expected
you need to 'merge a range of revisions'.

http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html

As the description for merge two tree says: "The net result is that
trunk now looks exactly like the branch."

Simon

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-06 15:57:35 CEST

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