Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
9 daysDiffs depending on pseudo-conflicts do not reject the other sidelgoubet1-2/+2
2019-08-30Fix diff, conflict detection and merging of non-unique attributeslgoubet12-1/+755
2019-07-17Fix detection of pseudo conflicts on single-valued attribute changeslgoubet7-4/+124
2017-06-27[514415] Relationships between diffs should be cachedMartin Fleck1-0/+420
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud4-30/+32
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix2-6/+6
2015-01-21[456860] Improve handling of equivalent three-way text changesPhilip Langer1-13/+303
2014-11-17[450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMapsStefan Dirix4-0/+143
2014-10-27[446947] Adds support for three-way merging multi-line String attributesPhilip Langer1-0/+449
2014-10-08Optimize dice coefficient storing bigrams within intsLaurent Goubet1-0/+21
2014-10-08Consider potential duplicates in String similarityLaurent Goubet1-4/+42
2014-09-25[443031] Fix NPE on FeatureFilter.referenceIsSetAxel Richard4-0/+170
2014-08-13Do not use assertSame for int comparison (2)Mikaël Barbero2-51/+50
2014-08-13Do not use assertSame for int comparisonMikaël Barbero2-13/+15
2014-05-21[435376] Conflicted subdiffs shouldn't be merged when CascadingFilter isAxel Richard1-3/+3
2014-03-25[406439] EMF Compare does not support list with null valuesAxel Richard1-0/+24
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet3-439/+439
2014-01-30Cleanup for version bumpingLaurent Goubet2-10/+13
2013-06-21Filling of the implication link with UML subsets.Cedric Notot2-99/+122
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet2-5/+7
2013-03-18Fix chocolate commitcbrun2-245/+0
2013-03-15Test infrastructure for validating diff detection using Change.ecorecbrun2-0/+245
2013-03-11remove unused and deprecated EMFCompareConfigurationMikaël Barbero1-1/+0
2013-03-11[402536] Merge sub diffs when filter "Sub diffs elements" is active.Axel Richard1-513/+609
2013-02-25Ignore the "time out" tests : the build machine is much too slow.Laurent Goubet1-3/+13
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet1-8/+21
2013-02-04Raise the timeout to 60sec for Eclipse Hudson afterMikaël Barbero1-1/+2
2013-01-31Raising timeout so that hudson can get this done within the limits.Laurent Goubet1-7/+10
2013-01-30[399361] Adding performance tests for the LCSLaurent Goubet1-0/+133
2013-01-08394668: Version 2.1 results 'compare' versus 1.3cbrun1-25/+105
2012-11-12Content Based Matchcbrun1-9/+9
2012-09-18Fix ArrayIndexOutOfBound exception in URIDistancecbrun1-0/+2
2012-09-18We should not use stat similarity to compare URIscbrun1-0/+73
2012-09-17Adding tests for the Dice Coefficientlgoubet1-0/+116
2012-08-31Some more unit tests for the out-of-scope values merging.lgoubet1-2/+2
2012-08-22removed DiffEngineTest (doublon with DiffUtilTest)Mikaël Barbero1-115/+0
2012-08-03add a EMFCompareConfiguration class to configure the match/diff/mergeMikaël Barbero2-108/+83
2012-06-01React to changes introduced by CBR with the EqualityHelperlgoubet1-41/+83
2012-06-01Acting the change to CRLF since all projects' settings set this as the file d...lgoubet2-8/+396
2012-06-01A few APIs changes :cbrun1-4/+8
2012-05-22Basic testing of the LCS algorithmlgoubet1-0/+103

    Back to the top