Eclipse Community Forums: Compare » EMF Compare shows only text compare

Help

Home

Home » Modeling » Compare » EMF Compare shows only text compare

Show: Today's Messages :: Show Polls :: Message Navigator

EMF Compare shows only text compare [message #1857616]

Thu, 16 February 2023 23:47

Ernesto Posse

Messages: 438
Registered: March 2011

Senior Member

Hi, I'm trying to test EMF Compare with EGit on a simple model from a custom (very simple) Ecore meta-model, (see the attached project defining the metamodel and a git repo with the sample model). The main problem I have is that whenever I do a comparison, e.g. between two branches, the Merge Tool shows only the Text Compare mode, and there are no options to select "Model Compare".

I played with the Eclipse Compare preferences, the EGit preferences and the EMF Compare preferences to no avail. Is there perhaps an extension point where I must register the language or content type?

When I do a comparison or merge of Papyrus UML models it does show the Model Compare mode, so I know it works on some models.

I'm using only the following EMF Compare plugins (which are the same as the ones included in Papyrus 4.8 2020-06):

org.eclipse.compare_3.7.1000.v20200511-1203.jar
org.eclipse.compare.core_3.6.900.v20200412-2017.jar
org.eclipse.emf.compare_3.5.3.202005260905.jar
org.eclipse.emf.compare.edit_4.3.1.202005260905.jar
org.eclipse.emf.compare.ide_3.4.3.202005260905.jar
org.eclipse.emf.compare.ide.ui_4.4.3.202005260905.jar
org.eclipse.emf.compare.rcp_2.5.2.202005260905.jar
org.eclipse.emf.compare.rcp.ui_4.4.2.202005260905.jar

Unfortunately I'm restricted to use these versions because of the version requirements of the product I'm working on.

Thanks

PS: The files attached are:
1) L1.zip contains the project with the Ecore meta-model, the genmodel and the generated model code;
2) emflang-examples.zip contains a git repo with some versions of a simple model called "m1.l1" on different branches

Attachment: L1.zip
(Size: 19.65KB, Downloaded 71 times)
Attachment: emflang-examples.zip
(Size: 32.28KB, Downloaded 72 times)

Report message to a moderator

Re: EMF Compare shows only text compare [message #1857722 is a reply to message #1857616]

Wed, 22 February 2023 21:38

Philip Alldredge

Messages: 20
Registered: February 2013

Junior Member

Have you looked at the tutorial? EMF Compare only compares resources with the appropriate content type: https://www.eclipse.org/emf/compare/documentation/latest/tutorial/tutorial.html

Report message to a moderator

Re: EMF Compare shows only text compare [message #1857724 is a reply to message #1857722]

Wed, 22 February 2023 23:50

Ernesto Posse

Messages: 438
Registered: March 2011

Senior Member

Ah! Yes I missed that. Thank you.

Nevertheless, that only describes how an end-user would associate a content type, but can it be done with an extension point? Or programmatically?

Thanks

Report message to a moderator

Previous Topic:	Custom content merge viewer
Next Topic:	Links to documentation broken

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Sep 20 23:58:34 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter