| [EMF Compare] Problem with three way merge [message #621617] |
Thu, 26 November 2009 09:40 |
Eclipse User |
|
|
|
Hi,
I'm trying to merge the contents of two instances of the same model using a
three (3) way merge after making a small change to each of the instaces but,
I am finding that the merged model contains only one set of changes, e.g.
the changes between ancestorEmfModel and remoteEmfModel. EMF compare is
removing the changes made in localEmfModel. This is the code that I'm
using:
MatchModel matchModel = MatchService.doContentMatch(localEmfModel,
remoteEmfModel, ancestorEmfModel,
Collections.<String, Object> singletonMap(MatchOptions.OPTION_IGNORE_ID,
true));
DiffModel diffModel = DiffService.doDiff(matchModel, false);
MergeService.merge(new ArrayList<DiffElement>(diffModel.getOwnedElements()),
true);
Is there any way of ensuring that EMF compare does not remove the changes
that took place between ancestorEmfModel and localEmfModel so that after a
merge I end up with both sets of changes?
Regards,
Jose
|
|
|
Powered by
FUDForum. Page generated in 0.07375 seconds
Home