[egit-dev] Logical model support for merge operations

[Laurent Goubet <laurent.goubet@xxxxxxx>]

Hi guys,

I've just pushed rebased reviews for a number of logical model-related 
changes on both EGit and JGit.

This is becoming quite complicated to keep properly ordered by 
dependencies, but in brief most of my changes waiting for review against 
EGit depend on changes in JGit, thus the failing hudson builds. These 
changes have been used on our side since february on custom builds, 
hence the numbers of them since I try to fix bugs detected because of 
them on separate reviews as they are found.

I won't detail every review I have opened; basically, they all aim at 
allowing customization of the merge strategy used by EGit so that, at 
least when performing merges (through either rebase, merge, cherry-pick, 
stash apply...) from EGit, we can be aware of the workspace and of the 
existing plug-ins that provide certain kind of files and know how to 
merge them (it doesn't even need to be a logical model, there might be 
plugins providing custom mergers for their own kind of files).

The changes I have against JGit aim at supporting customization through 
the opening of a few APIs in the ResolveMerger 
(https://git.eclipse.org/r/18969) and in the different operations' 
implementations (https://git.eclipse.org/r/22559).

On the opposite end, the 8 (recent) changes I submitted against EGit 
https://git.eclipse.org/r/#/q/status:open+owner:%22Laurent+Goubet+%253Claurent.goubet%2540obeo.fr%253E%22++project:egit/egit,n,z 
make use of these new APIs to call the necessary (existing) Team APIs to 
take models and custom mergers into account.

Laurent Goubet
Obeo

begin:vcard
fn:Laurent Goubet
n:Goubet;Laurent
org:<a href="http://www.obeo.fr";>Obeo</a>
email;internet:laurent.goubet@xxxxxxx
url:http://www.obeo.fr
version:2.1
end:vcard