Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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 Delaigue51-2467/+3
2016-07-01[495259] Add support for UML profile migration scenariosMartin Fleck50-1/+2467
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud57-999/+950
2016-06-10[479449] Introduce MultiplicityElementChangesAlexandra Buzila42-40/+1035
2016-06-07[493527] Correct conflict when concurrently unapplying UML stereotypesMartin Fleck6-6/+113
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-08-18Bump version for neon M1Laurent Goubet2-2/+2
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-10-02Bumping minor for all plugins/features changed since Luna SR13.1.0M2Axel Richard2-2/+2
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 Barbero33-489/+492
2014-08-07Create a parent pom for test (decl Jacoco)Mikaël Barbero1-3/+3
2014-07-18remove unnecessary directive in tests' pom.xmlMikaël Barbero1-1/+0
2014-07-17Reworked Maven buildMikaël Barbero1-1/+0
2014-07-07Test integration of profiles in EMF Compare.Arthur Daussy2-5/+17
2014-07-07Unit tests for DecoratorUMLProfileItemProviderAdapterFactoryArthur Daussy8-2/+359
2014-07-07Adds custom stereotypes icons.Arthur Daussy16-35/+1096
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-26StereotypedElementChangePostProcessor unit tests.Arthur Daussy17-13/+1875
2014-06-26Regenerates EMF Compare static test profile.Arthur Daussy16-157/+1611
2014-06-02Add Guava 15 to the accepted rangeLaurent Goubet1-2/+2
2014-04-15remove legacy junk in UML2 testsLaurent Goubet35-316612/+1
2014-03-27Update Luna target file to M6Axel Richard8-465/+100
2014-03-13normalize EOLs throughout EMF CompareLaurent Goubet106-12968/+12968
2014-02-17[418163] Manage display and merge of UML Stereotype PropertiesAxel Richard7-35/+205
2014-01-31reverting BREEs to Java 5, and versions along with themLaurent Goubet4-7/+7
2014-01-30Cleanup for version bumpingLaurent Goubet2-3/+3
2014-01-29Change BREEs to Java 1.6 and activate API error for missing descriptionsLaurent Goubet3-377/+377
2013-08-19Prepare for version 2.22.2.0M1Mikaël Barbero2-3/+3
2013-07-31Detection of change of profile version.Cedric Notot50-351/+727
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

Back to the top