Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [polarsys-iwg] one Question on Model Management with GIT

Title: one Question on Model Management with GIT

Hi Xavier,

 

We did a 3 year improvement project on this, you can see some public info at

http://wiki.eclipse.org/EMF_Compare/CompareUMLPapyrusAPI

http://wiki.eclipse.org/EMF_Compare/2012EMFCompareEnhancements

http://wiki.eclipse.org/EMF_Compare/Improvements_for_Ericsson_2013

In our case we have very big (50 000 modeling elements like transition, operations, data type, etc.), complex models, realtime issues, we put C code into models, etc. etc.

 

Some of our major requirements:

- graphical diff/merge (not XML)

- models stored in Git

- no locking of models required

 

Background info is we had to find a way to replace a customize proprietary SCM by Git and we couldn’t do this with CDO.

We also had many issues with model locking, e.g. one person has a lock and the rest of the employees are not able to work on this.

Instead of model locks we rely on accurate diff/merge and let users work at full speed, it is the same principle (and speed) as source code modifications, e.g. no locks in Git.

 

For system engineering UML models in papyrus, it is ready to use, the fastest way to start would be with an on-site workshop with Papyrus and EMF Compare people where they can show you how it works with your own models, you can ask Etienne and Sebastien (in CC).

You can also download the latest version of the code and try it but this will require more time.

 

The big release ready for prime time will be part of the Eclipse annual release in the spring of 2014, Francis (in CC) is now leading this initiative on our side.

 

Best Regards,

 

Dominique

 

 

From: polarsys-iwg-bounces@xxxxxxxxxxx [mailto:polarsys-iwg-bounces@xxxxxxxxxxx] On Behalf Of PLAVIS, Xavier
Sent: October-08-13 10:32 AM
To: polarsys-iwg@xxxxxxxxxxx
Subject: [polarsys-iwg] one Question on Model Management with GIT

 

Hello all,

I’m looking forward for some feedback on” how to manage models (UML or SYSML) with GIT”.

Using GIT, we need to have efficient tool allowing making “diff” on models as well as “merge”.

At Astrium, we face some problems we the Diff and Merge tools we have tried, which are not so efficient on XML files.

Can some of your gave us some feedback on such topics, we will be please to share experience.

Best Regards

Xavier

         Xavier PLAVIS  

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

ASTRIUM Satellites - France (EADS)

Data Processing and On-Board Software ACE76

SDE/SVE & Products Leader

Phone : +33(0)5 6219-5980     

Secr. : +33(0)5 6219-9027        

Fax   : +33(0)5 6219-5778     

    

E-mail: <xavier.PLAVIS@xxxxxxxxxxxxxxxx>

EADS ASTRIUM Satellite France

zone industrielle du palays

31, avenue des cosmonautes

31402 Toulouse cedex France

____________________________________________

Ce courriel (incluant ses eventuelles pieces jointes) peut contenir des informations confidentielles et/ou protegees ou dont la diffusion est restreinte. Si vous avez recu ce courriel par erreur, vous ne devez ni le copier, ni l'utiliser, ni en divulguer le contenu a quiconque. Merci d'en avertir immediatement l'expediteur et d'effacer ce courriel de votre systeme. Astrium decline toute responsabilite en cas de corruption par virus, d'alteration ou de falsification de ce courriel lors de sa transmission par voie electronique.
This email (including any attachments) may contain confidential and/or privileged information or information otherwise protected from disclosure. If you are not the intended recipient, please notify the sender immediately, do not copy this message or any attachments and do not use it for any purpose or disclose its content to any person, but delete this message and any attachments from your system. Astrium disclaims any and all liability if this email transmission was virus corrupted, altered or falsified. 
---------------------------------------------------------------------
Astrium SAS (393 341 516 RCS Nanterre) - Capital: 16.587.728 EUR - Siege social: 12 rue Pasteur, 92150 Suresnes, France

 


Back to the top