Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data
AgeCommit message (Expand)AuthorFilesLines
2019-05-23Merging single-valued containment changes can lead to dangling elements3.3.7M5lgoubet4-0/+39
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud2-14/+28
2016-04-27[492341] Res Att Change correctly implies diffs3.2.0M7Mathieu Cartaud2-2/+2
2016-01-26[485266] Fix merge consequences for delete/move conflictsMathieu Cartaud21-0/+298
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud7-1/+86
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix6-37/+43
2015-03-02[460675] Fix differences for noncontained FeatureMapEntries with movedStefan Dirix5-1/+49
2015-03-02[460923] Do not filter FeatureMapChanges on removed ElementsStefan Dirix3-1/+31
2015-03-02[460902] Fix Dependency Calculation for FeatureMap Add and DeleteStefan Dirix3-1/+30
2015-02-18[452147] Fix handling of diffs for interlocked one-to-one refsStefan Dirix5-2/+62
2014-12-17[453218] Add missing FeatureMapChanges concerning MovesStefan Dirix1-4/+5
2014-12-16[455255] Fix determination of TargetFeature in DiffUtilStefan Dirix4-1/+43
2014-12-16Adds unit test for enum3.1.0M4Arthur Daussy13-0/+83
2014-12-16[454579] Fix Nullpointer when element is moved out of FeatureMapStefan Dirix4-0/+54
2014-12-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard4-0/+76
2014-12-03[453749] Fix NullPointer when handling Non-Containment FeatureMapsStefan Dirix3-0/+45
2014-11-04[446252] Issue with feature ordering when merging FeatureMapsAlexandra Buzila3-0/+38
2014-10-14[446739] Fixes obtaining the target feature in three-way merge of a movePhilip Langer4-0/+59
2014-10-10Adds year of contribution to copyright headerPhilip Langer1-1/+1
2014-09-25[443504] Fix computation of ignored elements when finding insertion idxPhilip Langer3-0/+52
2014-08-24[442439] Fixes DiffUtil.getSourceList for moved and reordered elementsPhilip Langer3-0/+36
2014-08-20[441258] Prevents IllegalArgumentException on merging movesPhilip Langer3-0/+48
2014-08-20Adds test case exposing unsuccessful merge reported in bug 441172Philip Langer3-0/+54
2014-08-05[413520] Fixes IndexOutOfBoundsException on merging opposite referencesPhilip Langer3-0/+50
2014-07-31[440679] Avoids NPE when performing a movePhilip Langer5-0/+93
2014-07-07FeatureMaps: FeatureMapChanges testsAxel Richard70-0/+1370
2014-05-23[435053] Add Pseudo conflicts tests.Axel Richard13-0/+219
2014-03-28[418472] Cannot merge a move from nestedClassifier to packagedElementAxel Richard3-1/+48
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet1-336/+336
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard25-1/+311
2012-09-26Renaming AbstractInputData#loadFromClassLoader (typo).lgoubet1-54/+54
2012-08-31Some more unit tests for the out-of-scope values merging.lgoubet13-0/+209
2012-08-28Implementing the unit tests for the unsetting of mono-valued referenceslgoubet5-0/+62
2012-08-28Implementing a few more unit tests for the merging of out of scopelgoubet5-0/+59
2012-08-28Add first test for "out-of-scope values" merging, failing.lgoubet41-36/+101
2012-06-20Adding tests for all individual diffs that can be detected onlgoubet37-0/+742
2012-06-15Adding a number of unit tests for the merge operations.lgoubet4-121/+0
2012-06-07First draft of the merge implementation. We now handle merging of the Referen...lgoubet4-0/+121
2012-03-12Move all features and plugins that will be deprecated by the incoming restruc...lgoubet14-47964/+0
2012-03-06Missing copyright noticeslgoubet1-0/+10
2012-03-05Adding 2012 to EMF Compare's copyright noticeslgoubet2-2/+2
2012-01-24[369507] Implementing unit tests for one of the failing use caseslgoubet1-1/+20
2011-10-24Allows EMF Compare to properly handle proxies and unresolved proxieslgoubet1-4/+9
2011-10-20Provisioning the use cases and unit tests for simple multi-valuedlgoubet1-1/+56
2011-08-05Enhance list of use cases with the single-valued reference use cases.lgoubet1-1/+16
2011-08-04Enhancing use cases with the list of "complex" attribute reordering.lgoubet1-1/+18
2011-08-04Enhancing list of use cases with the "attribute" changeslgoubet2-144/+183
2011-08-03Enhancing list of possible comparison use cases with multiplelgoubet1-22/+98
2011-08-02Extract to super class in order to create more input data.lgoubet2-12/+29
2011-08-02Enhance list of the different possible comparison use caseslgoubet1-31/+63

Back to the top