Bug 466427 - Support Git Scm
Summary: Support Git Scm
Status: CLOSED FIXED
Alias: None
Product: EMF.Diffmerge
Classification: Modeling
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 466706
Blocks:
  Show dependency tree
 
Reported: 2015-05-05 09:28 EDT by Bouchet Stéphane CLA
Modified: 2017-01-10 11:59 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Bouchet Stéphane CLA 2015-05-05 09:28:27 EDT 
Hi,

This bug is to handle the support of models shared with Git.


The git support is to provide the integration of the diffMerge compare editor in all git actions that opens a compare editor.
Comment 1 Olivier Constant CLA 2015-05-29 03:44:16 EDT 
Let's target the post-Mars release.
Comment 2 Olivier Constant CLA 2016-03-04 12:10:28 EST 
Solved in https://git.eclipse.org/r/#/c/47425/.
Thanks for your contribution Stephane!
Comment 3 Eclipse Genie CLA 2016-04-20 08:20:09 EDT 
New Gerrit change created: https://git.eclipse.org/r/71065
Comment 4 Bouchet Stéphane CLA 2016-04-20 08:24:41 EDT 
hi,

i'm reopening since i fixed some integration in my side.

- i created a new method on the teamComparisonViewer to be able to create my own EMFDiffMergeEditorInput.
- i fixed an issue when trying to merge a conflict using local index version of a resource
- i added some Git URI Converter constructor for cases with my own urihandlers.
- i fixed an NPE on the AbstractComparisonViewer.
Comment 6 Olivier Constant CLA 2016-04-20 09:47:05 EDT 
Very nice, thanks.
Comment 7 Olivier Constant CLA 2017-01-10 11:59:57 EST 
Closing.