Eclipse Community Forums: EMF Diff/Merge

Help

Home

Home » Modeling » EMF Diff/Merge » git integration

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

git integration [message #1732548]

Wed, 18 May 2016 07:57

Felix Dorner

Messages: 392
Registered: December 2015

Senior Member

Hi Olivier,

I just stumbled across
https://bugs.eclipse.org/bugs/show_bug.cgi?id=492641 which suggests
there is some kind of git integration with diffmerge now? I anxiously
installed the latest build into capella and tried to compare some
revisions as model, but I don't find how to do it.. Is there anything I
need to do in addition to just installing the lates build?

Thanks,
Felix

ps. I hope you're doing good :)

Report message to a moderator

Re: git integration [message #1732696 is a reply to message #1732548]

Thu, 19 May 2016 09:32

Stephane Bouchet

Messages: 280
Registered: July 2009

Senior Member

Hi,
yes, there is an integration between Egit and diffmerge to bring the diffmerge compare editor while comparing resources handled by eGit.
I do not know the integration with Capella, but i did on my side with my models. you should at least install the diffmerge Egit feature and try to compare a model with one on the git history.
I think olivier can give more details about the Capella integration.

BTW, i will present these new feature during ECF.

Regards,

Stéphane.

Report message to a moderator

Re: git integration [message #1732701 is a reply to message #1732696]

Thu, 19 May 2016 09:56

Felix Dorner

Messages: 392
Registered: December 2015

Senior Member

On 19-May-16 11:32, Stephane Bouchet wrote:
> Hi,
> yes, there is an integration between Egit and diffmerge to bring the
> diffmerge compare editor while comparing resources handled by eGit.

This is really great news!

> I do not know the integration with Capella, but i did on my side with
> my models. you should at least install the diffmerge Egit feature and
> try to compare a model with one on the git history.

Hmm, I installed the feature, but I have no clue how to bring up the
diffmerge comparison editor when doing git comparisons.

Felix

Report message to a moderator

Re: git integration [message #1732704 is a reply to message #1732701]

Thu, 19 May 2016 10:18

Olivier Constant

Messages: 106
Registered: January 2012

Senior Member

Hi Felix,

You need to configure your Capella / Eclipse a bit. Preferences -> General -> Content types -> Text -> XML -> XML Metadata Interchange -> add *.melodymodeller and *.aird. It is not ideal because it relies on a specific storage format (XMI), but we do not know any other way to integrate with Team mechanisms.

Besides that, Capella has some peculiarities that also require a small update of its diff/merge customization plugin (overall ~10 LOCs to change in 2 classes). It has been tested but not pushed yet, tell me if you want to know more. You may be able to play a bit without this update but you will get exceptions from time to time.

FYI most of the generic work has been contributed by Stephane / Intel, and it also includes an integration with SVN and Perforce clients.

And yes I'm fine, thanks. You look in good shape too since you keep scanning bugzilla entries. Wink

Report message to a moderator

Re: git integration [message #1732797 is a reply to message #1732704]

Fri, 20 May 2016 09:50

Felix Dorner

Messages: 392
Registered: December 2015

Senior Member

On 19-May-16 12:18, Olivier Constant wrote:
> Hi Felix,
>
> You need to configure your Capella / Eclipse a bit. Preferences ->
> General -> Content types -> Text -> XML -> XML Metadata Interchange ->
> add *.melodymodeller and *.aird. It is not ideal because it relies on a
> specific storage format (XMI), but we do not know any other way to
> integrate with Team mechanisms.

Ok, I was only looking at Team->File Extensions and didn't find anything
there.

>
> Besides that, Capella has some peculiarities that also require a small
> update of its diff/merge customization plugin (overall ~10 LOCs to
> change in 2 classes). It has been tested but not pushed yet, tell me if
> you want to know more.

Yes I want to know more :) You might just push it into a separate branch
and I'll just use the sources/build it myself for testing. Or is it some
capella-specific code?

You may be able to play a bit without this update
> but you will get exceptions from time to time.

That's ok..

> FYI most of the generic work has been contributed by Stephane / Intel,
> and it also includes an integration with SVN and Perforce clients.

A whole new world opens with this feature.

> And yes I'm fine, thanks. You look in good shape too since you keep
> scanning bugzilla entries. ;)

I actually wanted to report this as an enhancement request but wanted to
check first if maybe someone already did.

Have a nice weekend!
Felix

Report message to a moderator

Re: git integration [message #1733227 is a reply to message #1732797]

Wed, 25 May 2016 07:33

Olivier Constant

Messages: 106
Registered: January 2012

Senior Member

Quote:

Yes I want to know more You might just push it into a separate branch
and I'll just use the sources/build it myself for testing. Or is it some
capella-specific code?

It is Capella-specific. However, the Capella team is willing to integrate these changes soon (between now and mid-June) so that they are available in nightly builds. I'll tell you when done, OK?

Report message to a moderator