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

Bug 355145

Summary: History Browser should offer compare
Product: [Modeling] EMFStore Reporter: Birgit Engelmann <birgit.engelmann>
Component: ClientcoreAssignee: Philip Langer <planger>
Status: CLOSED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: emueller, guillez, jfaltermeier, mkoegel
Version: unspecified   
Target Milestone: 1.5.0   
Hardware: PC   
OS: Windows 7   
See Also: https://git.eclipse.org/r/48667
https://git.eclipse.org/c/emf-store/org.eclipse.emf.emfstore.core.git/commit/?id=f23024aee85738ef3f388b77ee8bdee04ba7a795
https://git.eclipse.org/r/48968
https://git.eclipse.org/c/emf-store/org.eclipse.emf.emfstore.core.git/commit/?id=069f33dacb500257d74c102fa78f4cef28e70c40
Whiteboard:
Attachments:
Description Flags
New comparison plugin
none
patch for update of workspace to retrieve revisions
none
patch for ui elements in history browser none

Description Birgit Engelmann CLA 2011-08-18 14:38:49 EDT 
Created attachment 201738 [details]
New comparison plugin

To be able to compare revisions from Models it would be great to offer a nice comparison view. One Eclipse project which provides such a view is EMF Compare.

Please find attached the patches to include EMF Compare for comparison of revision in EMFStore.

The comparison can be triggered in the History Browser by selecting two revisions and right clicking and clicking compare.

The display is not quite optimal yet and there is an issue with displaying "orphans moved from null to null". This was reported on the emft mailing list: http://www.eclipse.org/forums/index.php/t/221722/
Comment 1 Birgit Engelmann CLA 2011-08-18 14:39:53 EDT 
Created attachment 201739 [details]
patch for update of workspace to retrieve revisions
Comment 2 Birgit Engelmann CLA 2011-08-18 14:40:20 EDT 
Created attachment 201740 [details]
patch for ui elements in history browser
Comment 3 Edgar Mueller CLA 2013-05-27 08:28:27 EDT 
This patch should finally be reviewed.
Comment 4 Edgar Mueller CLA 2013-07-29 04:13:09 EDT 
We implemented the desired functionality based on the patches. By default it is not part of the core because of the EMF Compare dependency.  The feature is called 'org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature'.
Comment 5 Guillermo Zunino CLA 2015-04-28 18:32:08 EDT 
I see the feature on git, but I cannot find it on 1.3, 1.4 and 1.5 p2 repositories.
Is this expected?
Comment 6 Edgar Mueller CLA 2015-05-06 11:05:41 EDT 
Hi Guillermo,
thanks for the report. This seems to be an misconfiguration issue on our side, we'll try to address it for the upcoming 1.5 release.
Comment 7 Edgar Mueller CLA 2015-05-08 06:29:21 EDT 
*** Bug 432987 has been marked as a duplicate of this bug. ***
Comment 8 Edgar Mueller CLA 2015-05-08 06:32:45 EDT 
We'll actually need to update EMF Compare to a more recent version.
Comment 9 Eclipse Genie CLA 2015-05-26 12:52:01 EDT 
New Gerrit change created: https://git.eclipse.org/r/48667

WARNING: this patchset contains 1240 new lines of code and may require a Contribution Questionnaire (CQ) if the author is not a committer on the project. Please see:https://wiki.eclipse.org/Project_Management_Infrastructure/Creating_A_Contribution_Questionnaire
Comment 11 Philip Langer CLA 2015-05-29 03:10:56 EDT 
I upgraded the EMFCompareComparator and target plattform to EMF Compare 3 with https://git.eclipse.org/r/#/c/48667/. The change has been merged.
Comment 12 Johannes Faltermeier CLA 2015-05-29 10:55:59 EDT 
The feature is missing on the update site. I will add it.
Comment 13 Eclipse Genie CLA 2015-05-29 11:00:52 EDT 
New Gerrit change created: https://git.eclipse.org/r/48968