Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 320843

Summary:	Resolving Tree Conflicts - Apply Local Changes doesn't work on 2.2.2
Product:	[Technology] Subversive	Reporter:	Seva Lapsha <seva.lapsha>
Component:	Core	Assignee:	Igor Burilo <igor.burilo>
Status:	RESOLVED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	a.gurov, ganoro, heiko.boettger, jtk499
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows XP
Whiteboard:

Description Seva Lapsha

2010-07-25 09:06:29 EDT

State reproduction:

1. There is a Turnk.
2. Branch B1 created from Trunk.
3. File F added to Trunk.
4. Branch B1 merged from Trunk.
5. Branch B2 created from Trunk.
6. Merge from B1 to B2. -> Tree conflict on file F (add, add).

Resolve Tree Conflict -> Apply local changes.

Result:

2.2.1: Works as expected.

2.2.2: Error: "svn: Tree conflicts can only be resolved to 'working' state"

Comment 1 Alexander Gurov

2010-09-14 10:41:53 EDT

Looks like this issue is really related to the SVN itself:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&viewType=browseAll&dsMessageId=2411874#messagefocus

So, for the time being we should avoid SVN::resolve() function usage while managing tree conflicts.

Temporary fix will be included into the next Subversive build (at least for my projects the "Edit Tree Conflicts" action seems to be working now).