EGit/Logical Model support

From Eclipsepedia

Jump to: navigation, search

This work is developed by Tasktop Technologies and sponsored by Ericsson in the context of the Modeling Platform Industrial Working Group

Contents

Background

The goal is here to provide a decent implementation of "logical model" support in EGit. The word "model" in "logical model" has nothing to do with the EMF concept of model. Sometimes in this document, we'll talk about logical resources interchangeably.

For more details about how logical model support has to be implemented relating to Team, you should read the document Team Support for Logical Model Integration.

For team providers like EGit, the following document is of high interest for implementation purposes: Repository Roadmap for Logical Model Integration

For model providers like EMF Compare, the following document is relevant: Model Roadmap for Logical Model Integration

EMF Compare will be used as one of the model providers to be tested as the team is currently working on support for Logical Models, see Logical Model support for EMF compare

Deliverables

  • Logical model support in Synchronize View
  • Compare editor support for merge conflicts from the Synchonize View
  • Design a model merge workflow across commits
  • Merge, Update and Commit support inside Synchronize View

Commit tree.png

  • Show conflicting commits in Synchronize View

Use cases

  • Take logical models into account on
    • Commit
    • Replace
    • Merge
    • Pull

Logical selection.jpg

Development

Development occurs on master branch of EGit, reviewed on Gerrit