Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf
AgeCommit message (Expand)AuthorFilesLines
2017-05-23[516572] Change models' superclass to MinimalEObjectImpl$ContainerPhilip Langer6-6/+6
2017-04-07[454529] Feature map changes prevent serializationguy perron1-3/+3
2017-01-20Merge algorithm refactoringLaurent Delaigue2-74/+85
2015-05-05Fix some of the warnings3.1.0M7Laurent Goubet11-1/+22
2015-04-27[463785] Add new concept in EMF Compare: ResourceLocationChangeAxel Richard14-835/+1308
2014-11-07Various API issuesLaurent Goubet3-0/+3
2014-10-21[448120] Adds FeatureMapChangeSpec with a useful toString() methodPhilip Langer1-4/+5
2014-07-03FeatureMaps: Add new Diff: FeatureMapChangeAxel Richard13-51/+676
2014-03-13normalize EOLs in the core (second pass)Laurent Goubet19-4694/+4694
2014-01-31reverting BREEs to Java 5, and versions along with themLaurent Goubet6-45/+45
2014-01-30Cleanup for version bumpingLaurent Goubet6-733/+973
2013-09-26[416936] - UML Refined elements filter changes diff orderAxel Richard9-1533/+1472
2013-07-29Add diagnostic to comparison object.Cedric Notot4-664/+932
2013-07-12Missing implementations of Conflict derived methodsLaurent Goubet1-342/+343
2013-06-21Filling of the implication link with UML subsets.Cedric Notot4-21/+273
2013-04-03[404541] Update Conflicts group arborescence.Axel Richard1-279/+279
2013-02-13Fixing/suppressing warnings.Laurent Goubet1-0/+2
2013-02-12[399456] Managed enhance readability of Resource Attachment ChangeAxel Richard6-4126/+4223
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet1-1/+9
2012-10-04happy checkstyle (javadoc)Mikaël Barbero3-262/+262
2012-10-04API embellishmentMikaël Barbero5-94/+57
2012-09-27First draft of the resource attachment change merge implementation. Thislgoubet1-3/+3
2012-08-27Getting rid of the last warnings of the core (for now...)lgoubet1-70/+67
2012-08-10change contract of Comparison#getDifferences(EObject) and fix bug inMikaël Barbero1-1/+9
2012-08-09Change isThreeWay to an attributecbrun4-11/+123
2012-08-06Fixing warning (useless imports)lgoubet1-2/+0
2012-08-03add a EMFCompareConfiguration class to configure the match/diff/mergeMikaël Barbero5-0/+99
2012-06-15Add merge support for Attribute changes.lgoubet1-3/+3
2012-06-15Removing factory_override, using the simple generation-gap patternlgoubet1-22/+8
2012-06-07First draft of the merge implementation. We now handle merging of the Referen...lgoubet6-13/+500
2012-05-10Adding the concept of pseudo-conflicts to the metamodel.lgoubet6-4/+452
2012-05-10Resolving useless imports warningslgoubet2-2/+0
2012-05-10Modification of the name of the reference Diff.equivalentDiffs toCedric Notot6-138/+138
2012-05-04add getAllSubmatches() and getAllDifferences() EOperations to the MatchMikaël Barbero8-0/+143
2012-04-27add Match#getComparison() EOperationMikaël Barbero4-3/+27
2012-04-20Regenerating compare metamodel with containment reference for equivalences, r...lgoubet8-51/+488
2012-03-23We now detect changes in attribute values, either single- orlgoubet3-0/+25
2012-03-22First implementation of the diff engine : detects containment changeslgoubet10-79/+192
2012-03-19First draft of the scope API.lgoubet1-57/+67
2012-03-13Introduce the new versions of the metamodel and tests for the EMF Compare core.lgoubet26-0/+7665

    Back to the top