Jump to: navigation, search

Difference between revisions of "EGit/Logical Model support"

Line 5: Line 5:
 
For team providers like EGit, the following document is of high interest for implementation purposes: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_repo.htm Repository Roadmap for Logical Model Integration]
 
For team providers like EGit, the following document is of high interest for implementation purposes: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_repo.htm Repository Roadmap for Logical Model Integration]
  
For model providers like [EMF Compare], the following document is relevant: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_model.htm Model Roadmap for Logical Model Integration]
+
For model providers like [http://www.eclipse.org/emf/compare/ EMF Compare], the following document is relevant: [http://help.eclipse.org/helios/topic/org.eclipse.platform.doc.isv/guide/team_model_model.htm Model Roadmap for Logical Model Integration]
  
 
== Deliverables ==
 
== Deliverables ==
  
 +
* Logical model support in Synchronize View
 
* Compare editor support for merge conflicts from the Synchonize View
 
* Compare editor support for merge conflicts from the Synchonize View
 
* Design a model merge workflow across commits
 
* Design a model merge workflow across commits
* Logical model support in Synchronize View
 
 
* Merge, Update and Commit support inside Synchronize View
 
* Merge, Update and Commit support inside Synchronize View
 
* Show conflicting commits in Synchronize View
 
* Show conflicting commits in Synchronize View

Revision as of 11:26, 18 May 2011

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

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
  • Show conflicting commits in Synchronize View

Development

Development occurs on master branch of EGit, reviewed on Gerrit