Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF Diff/Merge » git integration
git integration [message #1732548] Wed, 18 May 2016 07:57 Go to next message
Felix Dorner is currently offline Felix DornerFriend
Messages: 263
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 :)
Re: git integration [message #1732696 is a reply to message #1732548] Thu, 19 May 2016 09:32 Go to previous messageGo to next message
Stephane Bouchet is currently offline Stephane BouchetFriend
Messages: 276
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.
Re: git integration [message #1732701 is a reply to message #1732696] Thu, 19 May 2016 09:56 Go to previous messageGo to next message
Felix Dorner is currently offline Felix DornerFriend
Messages: 263
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
Re: git integration [message #1732704 is a reply to message #1732701] Thu, 19 May 2016 10:18 Go to previous messageGo to next message
Olivier Constant is currently offline Olivier ConstantFriend
Messages: 91
Registered: January 2012
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
Re: git integration [message #1732797 is a reply to message #1732704] Fri, 20 May 2016 09:50 Go to previous messageGo to next message
Felix Dorner is currently offline Felix DornerFriend
Messages: 263
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
Re: git integration [message #1733227 is a reply to message #1732797] Wed, 25 May 2016 07:33 Go to previous messageGo to next message
Olivier Constant is currently offline Olivier ConstantFriend
Messages: 91
Registered: January 2012
Member
Quote:
Yes I want to know more Smile 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?
Re: git integration [message #1744955 is a reply to message #1733227] Mon, 03 October 2016 11:25 Go to previous messageGo to next message
Felix Dorner is currently offline Felix DornerFriend
Messages: 263
Registered: December 2015
Senior Member
Sooooo, were the required changes pushed to capella in the meantime?
Re: git integration [message #1745145 is a reply to message #1744955] Wed, 05 October 2016 16:45 Go to previous messageGo to next message
Olivier Constant is currently offline Olivier ConstantFriend
Messages: 91
Registered: January 2012
Member
Yes. Razz
Re: git integration [message #1745188 is a reply to message #1745145] Thu, 06 October 2016 08:13 Go to previous messageGo to next message
Felix Dorner is currently offline Felix DornerFriend
Messages: 263
Registered: December 2015
Senior Member
So which change was it? Smile
Re: git integration [message #1745224 is a reply to message #1745188] Thu, 06 October 2016 16:16 Go to previous message
Olivier Constant is currently offline Olivier ConstantFriend
Messages: 91
Registered: January 2012
Member
commit 82daac471dc5844016218769b6375bf05eb3602b
Merge "[1186] Fix Capella contribution to contentTypes"
Previous Topic:Implied vs Explicit dependencies
Next Topic:IMatch question
Goto Forum:
  


Current Time: Mon May 21 13:19:16 GMT 2018

Powered by FUDForum. Page generated in 0.02187 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top