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

Bug 344848

Summary:	[server] Support for 3-way compare after merge happens.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Git	Assignee:	Project Inbox <orion.git-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	normal
Priority:	P3	CC:	bokowski, evan_hughes, Szymon.Brandys
Version:	0.2
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:
Bug Depends on:
Bug Blocks:	344286

Description libing wang

2011-05-05 10:36:49 EDT

In bug 344286 , I mentioned case 2 : 3-way compare after merge happens.
After talked to Tomasz , we agreed that this will be resolved differently.
Server will add additional information in the response(e.g. common ancestor URI)
The details for the response is not decided yet.

Comment 1 Tomasz Zarna

2011-05-05 12:11:13 EDT

(In reply to comment #0)
> Server will add additional information in the response(e.g. common ancestor URI)

Included in the response as "Base". I've tested it briefly, test cases also cover only simple scenarios but the new URI should work. See http://git.eclipse.org/c/e4/org.eclipse.orion.server.git/commit/?id=e7faf09c930b89fc0f47f7acceb8694c20fe46c8.

Leaving the bug open in case we decide to add something more to the response.

Comment 2 libing wang

2011-05-09 10:28:06 EDT

If now server returns old ,base and new . We may want diff uris liek , "old VS new" and "new VS base" , in addition to the existing "new VS old".

Comment 3 libing wang

2011-05-10 10:32:23 EDT

I thought it over about the common ancestor sitting in the middle and asked around.
Seems like having this UI will not help much.
But indeed from server API , we need "old VS
new" and "new VS base" , in addition to the existing "new VS old". We will figure out a better way how to bring up these diffs , maybe in separate pages if user needs it.

Comment 4 Tomasz Zarna

2011-05-30 10:16:19 EDT

According to http://wiki.eclipse.org/Orion/Milestone_Plan it has been deferred.

Comment 5 Tomasz Zarna

2011-08-18 10:01:29 EDT

(In reply to comment #3)
> But indeed from server API , we need "old VS
> new" and "new VS base" , in addition to the existing "new VS old".

Libing, do you still need these?

Comment 6 John Arthorne

2015-05-05 16:21:27 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