Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-07-12Do not consider a container deletion to conflict with unsets under itLaurent Goubet3-19/+50
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud6-52/+54
2014-08-13Do not use assertSame for int comparisonMikaël Barbero2-7/+8
2014-03-28[406516] Manage Parameterized Types in ComparisonAxel Richard5-0/+276
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet22-1269/+1269
2014-03-10Fix wrong keys when put WeightProvider in RegistryAxel Richard1-3/+4
2014-03-10Add WeightProvider RegistryAxel Richard1-1/+11
2014-01-30Cleanup for version bumpingLaurent Goubet7-36/+22
2013-07-08Restore ext library tests (conflict detection is now accurate)Laurent Goubet1-159/+164
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet3-21/+27
2013-04-18[381143] Do not nest containment deletion conflicts.Laurent Goubet2-2/+132
2013-03-19[403055] Provide a match engine extension mechanism.Axel Richard1-210/+228
2013-02-22[394668] MatchByContent v1 versus v2cbrun1-8/+11
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet1-8/+15
2013-01-21[381143] Conflict detection issueLaurent Goubet2-6/+162
2013-01-21Re-inserting textual description of changesLaurent Goubet1-0/+111
2012-11-20391798: elements with reference changes are not matched anymorecbrun4-0/+77
2012-11-20391657: Renaming detected instead of addition / deletioncbrun7-0/+93
2012-10-15add Monitor to all computing methods.Mikaël Barbero1-9/+12
2012-10-12Merge branch 'master' into api_embellishmentMikaël Barbero12-17/+141
2012-10-12Fix choco-commitcbrun1-6/+6
2012-10-11bug 390664: ignore XMI id option does not fully ignore ids cbrun2-5/+3
2012-10-10Bug 390664 - ignore XMI id option does not fully ignore idscbrun10-1/+130
2012-10-09use a EObject to URI cache with max size instead of weakKeysMikaël Barbero2-3/+6
2012-10-05set the EObject to URI cache to use weak keysMikaël Barbero2-3/+4
2012-10-04API embellishmentMikaël Barbero4-25/+33
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet2-10/+10
2012-09-18Oops, one class was missing.cbrun1-0/+89
2012-09-18389810 : Dynamic instance match failscbrun2-0/+100
2012-09-06Updating the API to launch comparison to a new paradigmlgoubet2-21/+31
2012-09-03Fixing Cedric's maillgoubet2-2/+2
2012-08-27Move the "reference not set" test out of the diff engine into thelgoubet1-0/+38
2012-08-213874611 : Non ID Based Matchingcbrun11-0/+45313
2012-05-16Fixing conflict detection for the remaining use cases.lgoubet1-1/+5
2012-05-10Adding the notion of "pseudo-conflicts" to the diff engine.lgoubet1-0/+5
2012-05-10We now detect changes for "identical deletions" on each side.lgoubet1-0/+5
2012-05-03Commiting all of the models corresponding to the conflict use cases.lgoubet1-0/+6
2012-04-24Drafting the API of the conflict detection processlgoubet5-0/+560

    Back to the top