Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare.tests
AgeCommit message (Expand)AuthorFilesLines
2016-05-31[493650] Fix order of merged childrenLaurent Delaigue5-293/+483
2016-05-10[492261] Merge ResourceAttChange in the right resourceMathieu Cartaud9-1/+303
2016-05-09[493255] Fix scalable conflict detectorLaurent Delaigue7-64/+159
2016-04-27[492341] Res Att Change correctly implies diffs3.2.0M7Mathieu Cartaud14-3/+200
2016-02-09Reactivate org.eclipse.emf.compare.tests test suite Mathieu Cartaud1-6/+23
2016-02-03[487011] Fix wrong conflict detectionMathieu Cartaud12-2/+231
2016-02-01Scalable conflict detectorMathieu Cartaud1-3/+3
2016-01-27Add missing test suite for Neon buildMathieu Cartaud1-0/+16
2016-01-26[485266] Fix merge consequences for delete/move conflictsMathieu Cartaud24-2/+635
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud11-1/+519
2016-01-05[484557] ResourceAttachment vs Attribute conflictsLaurent Delaigue15-1/+425
2015-12-04[479449] Raise conflict for addition to single-valued containment refPhilip Langer5-2/+113
2015-10-15Extract EMFCompareConfiguration from EMFCompareRCPUIPluginMathieu Cartaud1-16/+17
2015-10-05[478620] Cherry pick operation hangsAlexandra Buzila1-79/+123
2015-09-29[477767] Introduce new MatchingStrategy for models shared with git3.2.0M2Axel Richard1-3/+0
2015-09-24Manage move of empty papyrus resourcesLaurent Delaigue1-0/+3
2015-09-18Remove dependency to rcp in emf.compare.testsLaurent Delaigue9-968/+2
2015-09-02[475401] Add three-way tests for RootIDMatchingStrategyStefan Dirix56-0/+830
2015-09-02[475401] Modify RootIDMatchingStrategy to only return unique mappingsStefan Dirix27-1/+422
2015-08-18Bump version for neon M1Laurent Goubet2-2/+2
2015-07-31Only mark conflicting files as conflicting instead of the whole modelLaurent Goubet1-0/+179
2015-07-07Update Mars TPs with jdt.annotation pluginAxel Richard1-1/+1
2015-06-10[469237] Merge Refining diffs if all refined diffs have been mergedAxel Richard2-1/+89
2015-05-28[467576] Correct Handling of Proxies in ReqEngineMichael Borkowski2-2/+100
2015-05-27Add Mockito Dependency to org.eclipse.emf.compare.testsMichael Borkowski1-1/+3
2015-05-13[458971] Fix infinite loop in Graph.BreadthFirstIterator#prune()Axel Richard1-0/+27
2015-03-17[461224] Fix NoSuchElementException in Graph.Axel Richard1-0/+56
2015-03-17[462203] Child match appear as top-level match.Axel Richard2-1/+114
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix24-96/+351
2015-03-09[461291] Avoid matching proxies with actual objects inStefan Dirix8-2/+212
2015-03-04[458963] EMFCompare object doesn't use EMFCompareRCP registriesAxel Richard1-1/+44
2015-03-02[458147] Apply three-way merging also for rejecting attribute changesPhilip Langer1-24/+269
2015-03-02[460675] Fix differences for noncontained FeatureMapEntries with movedStefan Dirix6-2/+80
2015-03-02[460923] Do not filter FeatureMapChanges on removed ElementsStefan Dirix4-2/+77
2015-03-02[460902] Fix Dependency Calculation for FeatureMap Add and DeleteStefan Dirix4-2/+71
2015-02-18[452147] Fix handling of diffs for interlocked one-to-one refsStefan Dirix6-4/+145
2015-02-06[457034] ProximityEObjectMatcher should support cancellationLaurent Delaigue6-3/+619
2015-01-21[456860] Improve handling of equivalent three-way text changesPhilip Langer1-13/+303
2014-12-17[453218] Add missing FeatureMapChanges concerning MovesStefan Dirix4-7/+169
2014-12-16[455255] Fix determination of TargetFeature in DiffUtilStefan Dirix5-2/+64
2014-12-16Adds unit test for enum3.1.0M4Arthur Daussy15-0/+611
2014-12-16[454579] Fix Nullpointer when element is moved out of FeatureMapStefan Dirix6-0/+172
2014-12-16Adds new node types in the "Nodes" metamodel to test EEnumArthur Daussy12-9/+1203
2014-12-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard20-0/+731
2014-12-03[453749] Fix NullPointer when handling Non-Containment FeatureMapsStefan Dirix4-0/+60
2014-11-18[441172] Extend findMasterEquivalence to not only check eOppositesStefan Dirix4-2/+97
2014-11-17[450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMapsStefan Dirix5-3/+147
2014-11-04[446252] Issue with feature ordering when merging FeatureMapsAlexandra Buzila6-4/+63
2014-10-29[448464] Source list incorrectly determined when undoing changesAlexandra Buzila1-3/+6
2014-10-27[446947] Adds support for three-way merging multi-line String attributesPhilip Langer5-1/+1127

Back to the top