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

Bug 346391

Summary:	When editing conflicting Files in Diff-Editor while Merge, i get something like <<< mine ...
Product:	[Technology] Subversive	Reporter:	Alexander Malic <alexander.malic>
Component:	Core	Assignee:	Igor Burilo <igor.burilo>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	major
Priority:	P3	CC:	a.gurov
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Alexander Malic

2011-05-19 04:20:12 EDT

Build Identifier: 20110218-0911

This is really annoying because, as far as i understood the diff editor should not do anything automatically. and not put anything into the merged file, the user didn't select. 

Reproducible: Always

Steps to Reproduce:
1. create a branch
2. put some changes the same java file in trunk and created branch
3. try to merge, edit the conflicting file in diff editor, just select one change to be merged. save the file. -> compilation error

Comment 1 Jörg Thönnes

2011-05-20 04:51:25 EDT

Alexander, try to use the "Edit Conflicts" (on right-click pop-up menue) here, it processes the ">>" markes include by the low-level subversive API.
The compilation error results since the ">>" markers are really in the source code.

Since this is often confused, I wonder whether Subversive could make an intelligent guess here and do the Right Thing
automatically.

Comment 2 Alexander Gurov

2011-05-20 09:55:12 EDT

This is not a bug. That is how Subversion (not Subversive!) merge works. Subversion does not provide any API that could allow to avoid actual merging like it is possible with the Synchronize View when you're working with normal updates. And so, that is how it works for merge.

Regarding "suggesting and doing the right thing" - there is a different logic hidden behind the 'Edit Conflicts' action in compare to 'Open in Compare Editor' action, which is inherited from the Team support code and currently I can't think about any 'possible to implement' solution that could automatically substitute standard behaviour of the 'Open in Compare Editor' action.

P.S.
The same situation could happen not only with merge, but with update too (if you perform update without solving conflicts first). So, the right thing to do in that case is to use 'Edit Conflicts' action.