Eclipse Community Forums: EMF "Technology" (Ecore Tools, EMFatic, etc) » [EMF Compare] Problem with three way merge

Help

Home

Home » Modeling » EMF "Technology" (Ecore Tools, EMFatic, etc) » [EMF Compare] Problem with three way merge

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

[EMF Compare] Problem with three way merge [message #621617]

Thu, 26 November 2009 14:40

Jose Hernandez

Messages: 32
Registered: July 2009

Member

Hi,

I'm trying to merge the contents of two instances of the same model using a
three (3) way merge after making a small change to each of the instaces but,
I am finding that the merged model contains only one set of changes, e.g.
the changes between ancestorEmfModel and remoteEmfModel. EMF compare is
removing the changes made in localEmfModel. This is the code that I'm
using:

MatchModel matchModel = MatchService.doContentMatch(localEmfModel,
remoteEmfModel, ancestorEmfModel,
Collections.<String, Object> singletonMap(MatchOptions.OPTION_IGNORE_ID,
true));
DiffModel diffModel = DiffService.doDiff(matchModel, false);
MergeService.merge(new ArrayList<DiffElement>(diffModel.getOwnedElements()),
true);

Is there any way of ensuring that EMF compare does not remove the changes
that took place between ancestorEmfModel and localEmfModel so that after a
merge I end up with both sets of changes?

Regards,
Jose

Report message to a moderator

Previous Topic:	[EEF] Extend or customize EEF Widgets/Behaviour
Next Topic:	EEF generated classes do not compile

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Jun 22 15:20:05 GMT 2021

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter