Bug 110970 - [Merge] Fix CVS merge conflict markup with built-in compare tool
Summary: [Merge] Fix CVS merge conflict markup with built-in compare tool
Status: ASSIGNED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: CVS (show other bugs)
Version: 3.2   Edit
Hardware: PC All
: P5 enhancement (vote)
Target Milestone: ---   Edit
Assignee: platform-cvs-inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted
Depends on:
Blocks:
 
Reported: 2005-09-28 14:10 EDT by anatoly techtonik CLA
Modified: 2016-06-09 05:53 EDT (History)
1 user (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 anatoly techtonik CLA 2005-09-28 14:10:38 EDT 
It would be nice if Eclipse could be able to detect file with conflicts after
CVS merge and provide mechanizm to fix such file through built-in compare tool. 

The process is pretty straightforward - create two temporary copies of the file,
where file on the left panel is revision before update, which will be saved
after resolution and file on the right is new conflicting version from repository.
Comment 1 Michael Valenta CLA 2005-10-04 13:54:11 EDT 
We are working on support that will result in this behavior. Out first cut 
shoudl make it into M3.
Comment 2 anatoly techtonik CLA 2005-10-04 15:34:52 EDT 
Great to know. Tnx. =)
Comment 3 Michael Valenta CLA 2005-10-26 16:16:08 EDT 
We have just released support for this to HEAD. It is currently a work in 
progress so you will need to enable it on the Team>CVS>Work in Progress page. 
The preference is "Perform client side merges". When enabled, a Team>Update 
will merge all the non-conflicting files and then show any conflicts in the 
synchronize view.

I'm leaving this open as we still need to address this issue for branch merges
Comment 4 Michael Valenta CLA 2006-01-11 15:16:57 EST 
The request in this bug is valid but we wont have time to address the specific issue in 3.2. What we have done in 3.2 is provide options that will prevent CVS from adding the markup to the local file and will instead allow the user to manually merge the files as part of the update process. The reason we did this is that the text markup has a negative effect on incremental builders so we prefer to avoid it altogether.