resolving types of conflicts individually

[GoogleCodeExporter]

When resolving conflicts on a file that has more than one conflict (e.g., a 
text and a property conflict), all conflicts are marked as resolved even though 
only one of the conflicts is shown at a time.

For example, file has both text and property conflicts. Starting the "edit 
conflicts" command first shows the dialog to resolve the property conflict. If 
the user resolves that conflict (e.g., "using theirs") then the text conflict 
is resolved the same way!

First reported here:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=306628
3

quote:
If a file has a property and a text conflict and we choose to solve
the property conflict selecting "Resolve using their property", then
we get the error:

[[
The diffing engine aborted because of an error:
Can't open file 'C:\foo\bar\test.txt.r2': The system cannot find the
file specified.
]]

The property and the text conflict is solved using incoming values,
however TortoiseSVN did not ask us how we want to solve the text
conflict.

Can reproduce with TortoiseSVN 1.8.2 x64.

Reproduction script:

1. In a working copy, create new file "test.txt" with CONTENTS as
text, add it to SVN and commit (r1),
2. Modify the "test.txt" file: change text to KONTENTS and add new
custom mime-type property "/A", commit (r2),
3. Update the working copy to r1,
4. Modify "text.txt" to CONTENTZ and add custom mime-type property "/B",
5. Update working copy.
"text.txt" file is conflicted.
6. Choose "Edit Conflicts" for "text.txt", select "Resolve using their
property".

Error dialog:

---------------------------
TortoiseMerge
---------------------------
The diffing engine aborted because of an error:
Can't open file 'C:\foo\bar\test.txt.r2': The system cannot find the
file specified.
---------------------------
OK
---------------------------

Original issue reported on code.google.com by tortoisesvn on 14 Oct 2013 at 6:26

[GoogleCodeExporter]

To solve this, we have to extend the SVN::Resolve() command and use the 
conflict resolve callback - that's the only way to only resolve one conflict 
type at a time.

Original comment by tortoisesvn on 14 Oct 2013 at 6:27

[GoogleCodeExporter]

This issue was closed by revision r24846.

Original comment by tortoisesvn on 14 Oct 2013 at 8:17

• Changed state: Fixed

[GoogleCodeExporter]

This issue was closed by revision r24847.

Original comment by tortoisesvn on 14 Oct 2013 at 8:20