Skip to main content
AgeCommit message (Expand)AuthorFilesLines
2019-08-30Fix diff, conflict detection and merging of non-unique attributeslgoubet1-1/+4
2017-09-07[518760] Remove legacy JUnit3 artefactsMathieu Cartaud1-21/+0
2017-06-27[514415] Relationships between diffs should be cachedMartin Fleck1-1/+3
2017-01-24[510704] Add equivalent diffs in same conflictLaurent Delaigue1-2/+3
2017-01-24Merge test suite 'AtLeastLuna' with 'AllTests'Laurent Delaigue2-67/+6
2017-01-20Merge algorithm refactoringLaurent Delaigue1-2/+5
2017-01-13[508665] Delete EnumerationLiteral classifier changes from comparisonPhilip Langer1-2/+3
2017-01-13[483798] Introduce and use context in adapter factoriesMartin Fleck1-1/+2
2016-10-13[501864] Refactoring of group providers & filtersLaurent Delaigue1-5/+6
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud1-2/+2
2016-06-03Store all file URIs that have initially been in scopePhilip Langer1-1/+3
2016-05-31[493650] Fix order of merged childrenLaurent Delaigue1-2/+4
2016-05-10[492261] Merge ResourceAttChange in the right resourceMathieu Cartaud1-1/+2
2016-02-03[487011] Fix wrong conflict detectionMathieu Cartaud1-1/+2
2016-01-26[485266] Fix merge consequences for delete/move conflictsMathieu Cartaud1-2/+4
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud1-0/+63
2016-01-05[484557] ResourceAttachment vs Attribute conflictsLaurent Delaigue1-1/+2
2015-09-18Remove dependency to rcp in Delaigue1-3/+2
2015-09-02[475401] Modify RootIDMatchingStrategy to only return unique mappingsStefan Dirix1-1/+2
2015-06-10[469237] Merge Refining diffs if all refined diffs have been mergedAxel Richard1-1/+2
2015-05-28[467576] Correct Handling of Proxies in ReqEngineMichael Borkowski1-2/+5
2015-03-17[462203] Child match appear as top-level match.Axel Richard1-1/+2
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix1-4/+5
2015-03-09[461291] Avoid matching proxies with actual objects inStefan Dirix1-2/+5
2015-02-06[457034] ProximityEObjectMatcher should support cancellationLaurent Delaigue1-3/+4
2014-11-17[450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMapsStefan Dirix1-3/+4
2014-10-27[446947] Adds support for three-way merging multi-line String attributesPhilip Langer1-1/+7
2014-10-14[446739] Fixes obtaining the target feature in three-way merge of a movePhilip Langer1-1/+2
2014-09-25[443031] Fix NPE on FeatureFilter.referenceIsSetAxel Richard1-1/+3
2014-09-19[444351] Fix bug in EqualityHelper.matchingArraysAxel Richard1-1/+2
2014-07-31[440679] Avoids NPE when performing a movePhilip Langer1-1/+2
2014-07-07FeatureMaps: FeatureMapChanges testsAxel Richard1-2/+8
2014-05-23[435053] Add Pseudo conflicts tests.Axel Richard1-1/+2
2014-04-02New tests: Test ItemRegistryArthur Daussy1-1/+2
2014-01-30extract fuzzy in a test fragmentLaurent Goubet1-40/+0
2014-01-28[421609] ProximityEObjectMatcher match even when Distance function sais nocbrun1-1/+3
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard1-2/+3
2013-06-21Filling of the implication link with UML subsets.Cedric Notot1-5/+6
2013-03-19[403055] Provide a match engine extension mechanism.Axel Richard1-85/+87
2013-01-30[399361] Adding performance tests for the LCSLaurent Goubet1-4/+5
2013-01-24[398863] Provide a merge extension mechanismCedric Notot1-1/+2
2013-01-21[381143] Conflict detection issueLaurent Goubet1-2/+3
2013-01-08Enable Fuzzy tests for the Nodes ecore model.cbrun1-1/+2
2012-11-19refactor EMFCompareEditingDomain to implement an interface.Mikaël Barbero1-1/+2
2012-11-09add some test for compare.edit (esp. getChildren() of ItemProvider)Mikaël Barbero1-1/+3
2012-11-07Missing file from commit bf4c9d4Laurent Goubet1-0/+39
2012-11-07Extract the fuzzy tests from the standalone-capable test suite to a newLaurent Goubet1-2/+1
2012-10-30Merge Brute Force Testingcbrun1-1/+2
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet1-1/+2
2012-09-18We should not use stat similarity to compare URIscbrun1-1/+2

Back to the top