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

Merge two different trees menu ignores conflicts.

From: Hiroshi YOSHIKAWA <h.yoshikawa_at_kako.co.jp>
Date: Tue, 5 Aug 2014 19:03:54 -0700 (PDT)

[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
--
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086282
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-06 13:15:49 CEST

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