Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-05-23Merging single-valued containment changes can lead to dangling elements3.3.7M5lgoubet5-0/+203
2017-03-14Improve final state and MergeData when mergingLaurent Delaigue2-101/+115
2017-01-20Merge algorithm refactoringLaurent Delaigue8-339/+647
2016-09-12[442897] Fix markers issue in SMVMathieu Cartaud2-12/+12
2016-07-12Do not consider a container deletion to conflict with unsets under itLaurent Goubet1-21/+45
2016-07-11Format with mars formatter files forgotten in previous iterationMathieu Cartaud1-1/+2
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud12-335/+338
2016-05-31[493650] Fix order of merged childrenLaurent Delaigue3-288/+476
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 Cartaud23-0/+631
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud8-1/+355
2015-06-10[469237] Merge Refining diffs if all refined diffs have been mergedAxel Richard1-0/+87
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix6-37/+43
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
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-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard5-0/+343
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 Dirix1-2/+68
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 Langer2-0/+383
2014-10-20[441172] Fix merge order of equivalent diffs for one-to-one oppositesStefan Dirix1-1/+155
2014-10-14[446739] Fixes obtaining the target feature in three-way merge of a movePhilip Langer5-0/+209
2014-10-10Adds year of contribution to copyright headerPhilip Langer2-2/+2
2014-09-25[443968] Fix NPE in ComparisonUtils.getSubDiffsAxel Richard1-0/+25
2014-09-25[443504] Fix computation of ignored elements when finding insertion idxPhilip Langer4-0/+71
2014-08-24[442439] Fixes DiffUtil.getSourceList for moved and reordered elementsPhilip Langer4-1/+54
2014-08-22Fix merge-related UI feedback of the Structure viewerLaurent Goubet1-70/+134
2014-08-20[441258] Prevents IllegalArgumentException on merging movesPhilip Langer4-0/+62
2014-08-20Adds test case exposing unsuccessful merge reported in bug 441172Philip Langer4-1/+76
2014-08-13Do not use assertSame for int comparisonMikaƫl Barbero10-596/+589
2014-08-05[413520] Fixes IndexOutOfBoundsException on merging opposite referencesPhilip Langer4-17/+114
2014-07-31[440679] Avoids NPE when performing a movePhilip Langer6-0/+194
2014-07-07FeatureMaps: FeatureMapChanges testsAxel Richard74-0/+9700
2014-07-07FeatureMaps: Handle FeatureMapChange differencesAxel Richard1-8/+17
2014-05-28[434822] Conflict between move and deleteArthur Daussy1-1/+23
2014-05-23[435053] Add Pseudo conflicts tests.Axel Richard14-0/+776
2014-03-28[418472] Cannot merge a move from nestedClassifier to packagedElementAxel Richard4-1/+117
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet5-6132/+6132
2014-01-30Cleanup for version bumpingLaurent Goubet4-25/+25
2013-09-24[416400] - Fix IOWrappedException by adding a ConflictMergerAxel Richard27-5/+1500
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet4-160/+164
2013-02-11[400221] More extensible mergers... and use extensions for requirementsLaurent Goubet4-205/+208

Back to the top