Google Git
Sign in
eclipse / papyrus / org.eclipse.papyrus-collaborativemodeling / 2270c96ad19452908d6c122bfd12a47fec32ae7f
commit2270c96ad19452908d6c122bfd12a47fec32ae7f[log] [tgz]
authorChristian W. Damus <give.a.damus@gmail.com>Wed Nov 22 16:31:40 2017 -0500
committerChristian W. Damus <give.a.damus@gmail.com>Thu Nov 30 09:04:44 2017 -0500
tree381a075f2a94598ff0c790aeeecef1cfce3f3b31
parent8418b7f1e115d78cc6ab6b9099425a77bbaa0ed6 [diff]
Bug 527638 - Support diagram migration for Papyrus models

Solves the problem when you try to compare a model from a previous
version of Papyrus.
Solved by using the reconcile mechanism of Papyrus.

Ported from EMF Compare project change https://git.eclipse.org/r/#/c/84294 with changes:
- ensure that migration of multiple sides causes no spurious conflicts
  (detected by numerous failures in Git tests)
- remove Mars compatibility no longer needed
- add JUnit tests
- other minor touches
- support maven build on Mac platform

Change-Id: I2925d9ac70a6cc421be9ba9ba7f5d6906b1aa1af
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
Also-by: Christian W. Damus <give.a.damus@gmail.com>
14 files changed
tree: 381a075f2a94598ff0c790aeeecef1cfce3f3b31
  1. plugins/
  2. releng/
  3. tests/
  4. .gitattributes
  5. .gitignore
  6. .project
  7. CONTRIBUTING.md
  8. pom.xml
  9. README.MD
README.MD

Papyrus Collaborative Modeling

This is the collaborative modeling git repository

This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)