Conflict with merge

Hi,
we are using SVN on our project and found something tricky. When performing a merge we are getting a conflict, although we think there shouldn't be. Here a procedure how to get the conflict:

1) add and commit following folder structure:
ParentFolder\Trunk\AnotherFolder\YetAnotherFolder\File.txt
content of the file is:
line1
line2
line3

2) create a branch Branch from Trunk (right click Trunk folder, TortoiseSVN->Branch/tag), HEAD revision of the repository

3) update my ParentFolder, so I see newly branched Branch. Now I have following tree structure:
ParentFolder\Trunk\AnotherFolder\YetAnotherFolder\File.txt
ParentFolder\Branch\AnotherFolder\YetAnotherFolder\File.txt

4) do a change to File.txt inside Branch\AnotherFolder\YetAnotherFolder, change the content to:
line1
lineXX
line3

commit the File.txt directly (right click File.txt in Branch\AnotherFolder\YetAnotherFolder -> SVN Commit...)

5) merge from Branch folder to Trunk folder (right click Trunk folder, TortoiseSVN->Merge->Merge a range of revisions. URL is the url to Branch, in Show log there are 2 logs: creation and modification, select only the revision with modification)

6) commit Trunk after the merge (right click Trunk folder->SVN Commit...)

7) do again a change in the File.txt inside Branch\AnotherFolder\YetAnotherFolder, change content to:
line1
lineYY
line3

again commit directly the file File.txt itself

8) now we want to merge again the change, but this time on diferent folder level. Trying to do a merge to Trunk/AnotherFolder/YetAnotherFolder from Branch/AnotherFolder/YetAnotherFolder. Right click YetAnotherFolder in Trunk/AnotherFolder, TortoiseSVN->Merge...->Merge a range of revisions. URL is url to Branch/AnotherFolder/YetAnotherFolder, in Show log I can see creation and 2 changes (why 2, if it was already merged ?!?), I choose those 2 changes, try to perform the merge but get a conflict!

Trying to resolve I see this diffs:
Theirs: lineYY
Mine: lineXX

Why do we get those errors when merging first on "parent" folder and then merging on some "child" folder? Causing us big problems... Is it a Tortoise bug?

Client info:
TortoiseSVN 1.7.12, Build 24070 - 64 Bit , 2013/03/29 08:00:43
Subversion 1.7.9,
apr 1.4.6
apr-utils 1.3.12
neon 0.29.6
OpenSSL 1.0.1e 11 Feb 2013
zlib 1.2.7

Server: version 1.5.6

Thanks for help!

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-04-30 11:40:37 CEST