|
Re: Programmatically invoking a match engine [message #1745532 is a reply to message #1745347] |
Wed, 12 October 2016 07:46 |
|
hi,
Using the JGit mergers directly involves quite a bit or work and setting up. Make sure you look at the other places where they are used in the JGit and EGit code bases to see how they are initialized and invoked. You need to make sure the comparison engine actually has access to all the data it needs to compare your revisions.
As for your conflicts, I'd suggest you try directly from eclipse instead of using your custom code to invoke EMF Compare through git actions such as Team > Compare With > Revision and see if you get the result you're expecting or not. If not, then yes, you will have to customize the match and diff engines to properly detect the kind of conflicts (or lack of conflicts) you envision. I'd suggest taking a look at what you can do through post-processing of the differences model since that is usually enough. The developer guide explains how to provide your custom post-processor through extension points so that they are "seen" at runtime by EMF Compare when it is invoked for a comparison.
Laurent Goubet
Obeo
|
|
|
Powered by
FUDForum. Page generated in 2.31371 seconds