Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [mdt-papyrus.dev] Demo of Papyrus Model Repository with CDO posted
Hi, Sébastien,

Yes, I think that would be the primary focus for a more complete conflict resolution strategy.    CDO includes some support for computing matches according to the EMF Compare 2.x API, and also branching and merging object histories in a repository.  Currently, though, none of that is in the scope of the initial implementation of CDO in Papyrus in this Kepler release.

CDO does provide a conflict resolver that hooks into a transaction to resolve conflicts automatically by merging changes committed to individual features by remote transactions.  This is something that I need to evaluate as a means to help reduce the number of conflicts that are presented to users in the first place.

cW


On 2013-02-19, at 11:17 AM, GERARD Sebastien 166342 <Sebastien.GERARD@xxxxxx> wrote:

Hi,
 
It is a nice demo, great. One question about merging and conflict resolution strategies: could we have a manual-strategy implemented using EMF Compare to see the differences and do the merges?
 
Best, Sébastien.
 
------------------------------------------------------------------------------------------------------------------------------------------------
Sébastien Gérard
+33 (0)1 69 08 58 24 / +33(0)6 88 20 00 47
CEA Saclay Nano-INNOV
Institut CARNOT CEA LIST
DILS/Laboratoire d’Ingénierie dirigée par les modèles pour les Systèmes Embarqués (LISE),
Point Courrier n°174
91 191 Gif sur Yvette CEDEX
 
 
De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de Christian W. Damus
Envoyé : mardi 19 février 2013 15:32
À : Papyrus Project list
Objet : Re: [mdt-papyrus.dev] Demo of Papyrus Model Repository with CDO posted
 
Hi, Sébastien,
 
 
cW
 
 
On 2013-02-19, at 9:27 AM, GERARD Sebastien 166342 <Sebastien.GERARD@xxxxxx> wrote:


Can  you send the link to your blog?

Thanks.

------------------------------------------------------------------------------------------------------------------------------------------------
Sébastien Gérard
+33 (0)1 69 08 58 24 / +33(0)6 88 20 00 47
CEA Saclay Nano-INNOV
Institut CARNOT CEA LIST
DILS/Laboratoire d'Ingénierie dirigée par les modèles pour les Systèmes Embarqués (LISE),
Point Courrier n°174
91 191 Gif sur Yvette CEDEX

www.eclipse.org/papyrus



-----Message d'origine-----
De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-
bounces@xxxxxxxxxxx] De la part de Christian W. Damus
Envoyé : mardi 19 février 2013 15:00
À : Papyrus Project list
Objet : [mdt-papyrus.dev] Demo of Papyrus Model Repository with CDO posted

Hi, Team,

My latest blog post [1] presents a short demo of the current state (as of the end
of last week) of my work on integration of CDO model repositories in Papyrus.
I would greatly appreciate your feed-back on the UI workflows, and of course a
review of the code in the cdo_kepler branch, in Bug 290952 [2] and its
dependencies.

Thanks,

Christian


[1] http://give-a-damus.blogspot.ca/2013/02/papyrus-model-repositories.html

[2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=290952

_______________________________________________
mdt-papyrus.dev mailing list
mdt-papyrus.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-papyrus.dev
_______________________________________________
mdt-papyrus.dev mailing list
mdt-papyrus.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-papyrus.dev
 
_______________________________________________
mdt-papyrus.dev mailing list
mdt-papyrus.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-papyrus.dev

Back to the top