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
Hello Xavier,
that is one of the reasons, why we use a lot of textual DSLs (Xtext). With the right grammar the diff and merge is no big deal. (www.eclipse.org/etrice)
 
Since I suppose you have to stay with the XML files, here my thoughts: 
- If you have the XSDs for your XML Format you could generate an ecore spec from the XSD and use EMF Diff/Merge -> works for small projects, but I have no experience with bigger, distributed models
- Use an XML Diff Tool (Win Merge, Projectmerge, ...) -> so far I have not found the perfect tool
 
Please let me know about your final solution.
 
Regards,

Thomas
 
 
------------------
Besuchen Sie uns auf dem Embedded 4 You Technologietag:
 
------------------
Dipl.-Ing. Thomas Schuetz
Geschäftsführer
Protos Software GmbH
Agnes-Pockels-Bogen 1
80992 München
Phone: +49-89-624185-10
Fax: +49-89-624185-49

mailto: ts@xxxxxxxxx
http://www.protos.de
 

Von: polarsys-iwg-bounces@xxxxxxxxxxx [mailto:polarsys-iwg-bounces@xxxxxxxxxxx] Im Auftrag von PLAVIS, Xavier
Gesendet: Dienstag, 8. Oktober 2013 16:32
An: polarsys-iwg@xxxxxxxxxxx
Betreff: [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