Skip to main content
AgeCommit message (Expand)AuthorFilesLines
2019-07-17[522080] [UML] Add-add conflicts in stereotype application not detectedChristian W. Damus21-2/+511
2019-04-08The UML tests shouldn't use a cached instance of EMFComparelgoubet1-8/+5
2018-02-05[522064] Profile-application version check too restrictive in three-wayChristian W. Damus11-2/+269
2017-09-07[516060] Opaque Action Body conflict resolution results in wrong bodyMartin Fleck1-18/+79
2017-08-22Separate core & extra buildsLaurent Goubet5-313/+3
2017-03-14Improve final state and MergeData when mergingLaurent Delaigue1-7/+8
2017-01-20Merge algorithm refactoringLaurent Delaigue11-429/+786
2017-01-13[508665] Delete EnumerationLiteral classifier changes from comparisonPhilip Langer11-7/+309
2016-09-28[501864] Do not add refined diffs to conflicts of refining diffsPhilip Langer3-101/+143
2016-07-25Split tests to isolate dependencies to papyrusLaurent Delaigue49-2454/+2
2016-07-01[495259] Add support for UML profile migration scenariosMartin Fleck48-0/+2452
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud42-585/+572
2016-06-10[479449] Introduce MultiplicityElementChangesAlexandra Buzila40-38/+1033
2016-06-07[493527] Correct conflict when concurrently unapplying UML stereotypesMartin Fleck5-5/+111
2016-01-05[484576] Fix bug on pseudo-conflict computationLaurent Delaigue6-1/+107
2015-10-22[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard5-1/+305
2015-10-01Implementation of contextual tooltipsMathieu Cartaud40-17/+445
2015-06-18Fix UML DanglingStereotypeApplication detectionAxel Richard4-0/+37
2015-06-18[Tests] Add tests for new UML dangling Stereotype Application conceptAxel Richard9-1/+394
2015-05-11[466552] Increase priorities of conflict mergersStefan Dirix7-9/+157
2015-03-10[458147] Three-way merging for rejecting opaque element body changesPhilip Langer1-1/+31
2015-01-21[456860] Improve handling of equivalent three-way text changesPhilip Langer1-1/+1
2014-12-19[455677] Fixes insertion index of opaque element body values additionsPhilip Langer1-0/+29
2014-12-19[451365] Removes conflicts and implications of refining diffsPhilip Langer1-33/+27
2014-12-07[451365] Adds specific handling of opaque action, behavior & expressionPhilip Langer51-2/+1998
2014-11-07Various API issuesLaurent Goubet1-1/+0
2014-11-07Add missing copyrightsLaurent Goubet38-0/+380
2014-10-10Modify merge to handle implications properlyLaurent Goubet4-16/+42
2014-10-08Adds tests to load UML profile in NotLoadingResourceSet.Arthur Daussy1-1/+1
2014-08-13Do not use assertSame for int comparison (2)Mikaël Barbero24-170/+91
2014-08-13Do not use assertSame for int comparisonMikaël Barbero26-473/+488
2014-07-07Test integration of profiles in EMF Compare.Arthur Daussy1-4/+15
2014-07-07Unit tests for DecoratorUMLProfileItemProviderAdapterFactoryArthur Daussy7-1/+356
2014-06-26StereotypedElementChangePostProcessor unit tests.Arthur Daussy17-13/+1875
2014-03-27Update Luna target file to M6Axel Richard7-462/+97
2014-03-13normalize EOLs throughout EMF CompareLaurent Goubet100-12694/+12694
2014-02-17[418163] Manage display and merge of UML Stereotype PropertiesAxel Richard7-35/+205
2013-07-31Detection of change of profile version.Cedric Notot49-351/+654
2013-07-12[410737] preserve ordering even for equivalent differences.lgoubet1-9/+0
2013-07-08A macroscopic change for differences on UML DirectedRelationship.Cedric Notot11-53/+70
2013-06-21Filling of the implication link with UML subsets.Cedric Notot18-120/+3159
2013-06-19Fix requirement link between a unit difference and a macroscopic change.Cedric Notot2-4/+4
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet24-402/+190
2013-05-24Add test to check intersections between macroscopic changes.Cedric Notot23-0/+87
2013-04-19Alignment of UML JUnit tests.Cedric Notot3-28/+35
2013-04-15Re-work on factories for UML macroscopic changes.Cedric Notot4-5/+14
2013-04-10Alignment of UML Engine and TU in relation to AbstractChangeFactoryCedric Notot20-242/+238
2013-03-18[403187] Ordering post processorsAxel Richard1-151/+152
2013-03-11refactored IPostProcessor to move nsURI and resourceURI to DescriptorMikaël Barbero1-4/+5
2013-03-11refactor UML plugins to make all classes internal before kepler m6Mikaël Barbero24-32/+32

Back to the top