Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 320843 - Resolving Tree Conflicts - Apply Local Changes doesn't work on 2.2.2
Summary: Resolving Tree Conflicts - Apply Local Changes doesn't work on 2.2.2
Status: RESOLVED FIXED
Alias: None
Product: Subversive
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows XP
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-25 09:06 EDT by Seva Lapsha CLA
Modified: 2010-09-14 10:41 EDT (History)
4 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Seva Lapsha CLA 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 CLA 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).