kesavanpos / tortoisesvn

Automatically exported from code.google.com/p/tortoisesvn
0 stars 0 forks source link

Tree conflict dialog fails to resolve conflict correctly in merge with added files #51

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
What's the link to the discussion about the problem on the mailing list?
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=26302
01&orderBy=createDate&orderType=desc

What steps will reproduce the problem?
1. Create empty SVN repository with standard trunk and branches
directories (empty trunk). Create a branch of the trunk.
2. Create a new file with the same name in both trunk and branch.
Commit both.

3. In the working copy of the branch, use TortoiseSVN to merge the
trunk to the branch. A tree conflict results. 

4. In the Merge results dialog, right-click the tree conflict and
choose Edit Conflicts. The dialog reads "The last merge operation tried to
add the file 'foo.txt', but it was already added locally."

5. Click "Keep the file from the repository."

What is the expected output? What do you see instead?
Expected: The version from trunk is saved to the working copy.
Actual: The version from the working copy is retained.

What version of TortoiseSVN are you using?
TortoiseSVN 1.6.11, Build 20210 - 32 Bit , 2010/09/30 20:36:44
Subversion 1.6.13, 
apr 1.3.8
apr-utils 1.3.9
neon 0.29.4
OpenSSL 0.9.8o 01 Jun 2010
zlib 1.2.3

What Windows version are you using?
Windows 7 Professional

Please provide any additional information below.

Original issue reported on code.google.com by HorvatKr...@gmail.com on 12 Nov 2010 at 12:54

GoogleCodeExporter commented 9 years ago
Since the action "use file/dir from repository" can only be done in very 
special cases, we should just hide that button in all cases where it won't work.

Original comment by tortoisesvn on 23 Jan 2011 at 8:24

GoogleCodeExporter commented 9 years ago
This issue was closed by revision r20754.

Original comment by tortoisesvn on 23 Jan 2011 at 8:37