Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 364851 - [Compare]Support 3-way compare.
Summary: [Compare]Support 3-way compare.
Status: RESOLVED WONTFIX
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.3   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 344286
Blocks: 339045
  Show dependency tree
 
Reported: 2011-11-25 10:54 EST by libing wang CLA
Modified: 2015-05-05 14:44 EDT (History)
3 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 libing wang CLA 2011-11-25 10:54:42 EST 
We need a 3-way compare widget on the client side to support 3-way compare.
The design approach is to have the existing 2-way compare widget sitting in the bottom and an editor component sitting above for the common ancestor.
The 2-way compare widget will work the same as it is, while the common ancestor is highlighted with appropriate block where the conflicts happens.
Comment 1 Evan Hughes CLA 2011-11-25 11:01:41 EST 
The Jazz team is really looking forward to this. See https://jazz.net/jazz/resource/itemName/com.ibm.team.workitem.WorkItem/182066.
Comment 2 libing wang CLA 2011-11-29 09:57:31 EST 
Evan and I already put some efforts on making the current 2-way compare consumable by Jazz team.
We have no plan to support 3-way compare in 0.4 plan.
Comment 3 John Arthorne CLA 2015-05-05 14:44:45 EDT 
Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:

https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html