Eclipse Community Forums: EMF "Technology" (Ecore Tools, EMFatic, etc)

Help

Home

Home » Modeling » EMF "Technology" (Ecore Tools, EMFatic, etc) » [EMF compare] merging explanation

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

[EMF compare] merging explanation [message #481143]

Wed, 19 August 2009 18:08

Eclipse User

Originally posted by: mugbi83.googlemail.com

Hi

After some time searching for good model comparison software I came
across EMF compare. From what I have seen so far it is really a great
piece of work but sadly the documentation could not answer all of my
questions. I hope that you can fill these gaps.

I had no problems with matching elements and using the difference engine
to get a match- and diffmodel (I used the standalone example and EMF
models). I understand how this works but after these steps I want to
merge both models. This seems to be a very tricky part.

So my actual question is: what happens when calling
MergeService.merge(....) ? Does this really merge the left and the right
model (according to the Boolean parameter and the diffs), are these
changes also stored in the ResourceSet? Does merge use the diffs and the
two models in the resource set?

Is it possible to store the diff-/matchmodels and apply the changes
later, without loading both models but only one of them? Like: Store
the snapshot, store the left model; two days later apply the merging on
he left model (the right model was deleted). Is this possible?

I hope my questions are not too confusing
Thanks for your attention,
Best regards
Philipp

Report message to a moderator

Re: [EMF compare] merging explanation [message #481247 is a reply to message #481143]

Thu, 20 August 2009 09:04

Laurent Goubet

Messages: 1902
Registered: July 2009

Senior Member

This is a multi-part message in MIME format.
--------------090009020804000403050604
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 8bit

Hi philipp,

Comments inlined below.

philipp kalb a

Report message to a moderator

Re: [EMF compare] merging explanation [message #481297 is a reply to message #481247]

Thu, 20 August 2009 12:13

Eclipse User

Originally posted by: mugbi83.googlemail.com

Hi

Thanks a lot for your fast response!
I will take a look at EPatch

best regards
Philipp

laurent Goubet schrieb:
> Hi philipp,
>
> Comments inlined below.
>
> philipp kalb a écrit :
>> Hi
>>
>> After some time searching for good model comparison software I came
>> across EMF compare. From what I have seen so far it is really a great
>> piece of work but sadly the documentation could not answer all of my
>> questions. I hope that you can fill these gaps.
>>
>> I had no problems with matching elements and using the difference
>> engine to get a match- and diffmodel (I used the standalone example
>> and EMF models). I understand how this works but after these steps I
>> want to merge both models. This seems to be a very tricky part.
>>
>> So my actual question is: what happens when calling
>> MergeService.merge(....) ? Does this really merge the left and the
>> right model (according to the Boolean parameter and the diffs), are
>> these changes also stored in the ResourceSet? Does merge use the diffs
>> and the two models in the resource set?
>
> The in-memory model (either left or right, depending on the boolean
> param) will be changed according to the merged diff element. One of the
> two resources (or both if you merge multiple differences in multiple
> directions) is changed as the result of each call to
> MergeService.merge(). Note that the changes resulting from a merge are
> _not_ saved to disk until you save the resource yourself.
>
>>
>> Is it possible to store the diff-/matchmodels and apply the changes
>> later, without loading both models but only one of them? Like: Store
>> the snapshot, store the left model; two days later apply the merging
>> on he left model (the right model was deleted). Is this possible?
>
> This isn't possible with the "basic" merging features. You'll have to
> take a look at the EPatch feature Moritz implemented and commmited for
> the last release of EMF Compare. Though it isn't fully integrated with
> the UI yet, you can take a look at the unit tests of the
> o.e.emf.compare.epatch.tests plugin in order to have an idea as to how
> to get this to work :).
>
>>
>> I hope my questions are not too confusing
>> Thanks for your attention,
>> Best regards
>> Philipp
>
> Cheers,
>
> Laurent Goubet
> Obeo
>

Report message to a moderator