Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare
AgeCommit message (Expand)AuthorFilesLines
2016-05-30Fix wrong conflict detectionsLaurent Delaigue2-4/+6
2016-05-30[494723] Use safeEGet instead of eGetLaurent Goubet5-11/+12
2016-05-12Fix checkstyle on RACConflictSearchLaurent Delaigue1-0/+6
2016-05-09[493255] Fix scalable conflict detectorLaurent Delaigue1-3/+14
2016-05-09[488089] Fix random position of diagrams after mergeSimon Delisle1-2/+15
2016-04-27[492341] Res Att Change correctly implies diffs3.2.0M7Mathieu Cartaud1-18/+76
2016-02-26Fix NPEs because comp.getMatch can return nullLaurent Delaigue1-13/+30
2016-02-26[487561] Fix issue on resource attachment move conflict detectionMathieu Cartaud1-7/+4
2016-02-19[487561] Fix missing conflict on resource uncontrolMathieu Cartaud1-0/+18
2016-02-09Remove useless method in ResourceAttachmentChangeConflictSearchCM_201602091803Mathieu Cartaud1-28/+0
2016-02-03[487011] Fix wrong conflict detectionMathieu Cartaud2-11/+17
2016-02-02[485513] Fix NPE in NameMatchingStrategy.findMatchLaurent Delaigue1-2/+25
2016-02-01Improve progress monitor to allow cancelling3.2.0M5Mathieu Cartaud1-0/+4
2016-02-01Scalable conflict detectorMathieu Cartaud14-220/+2504
2016-01-26[485266] Fix merge consequences for delete/move conflictsMathieu Cartaud1-16/+60
2016-01-20[485020] Fix EditionDistance weight providerLaurent Delaigue1-67/+87
2016-01-19Improve logsLaurent Delaigue5-7/+68
2016-01-08Improve logging during comparison for conflictsLaurent Delaigue2-10/+10
2016-01-08[484579] Fix merge consequences algorithmMathieu Cartaud1-10/+32
2016-01-08Add debug logging for merge actionsMathieu Cartaud3-4/+122
2016-01-06Make required differences order deterministicLaurent Delaigue3-15/+12
2016-01-05Fix signature of predicateLaurent Delaigue1-1/+1
2016-01-05[484557] ResourceAttachment vs Attribute conflictsLaurent Delaigue1-5/+35
2016-01-05[484576] Fix bug on pseudo-conflict computationLaurent Delaigue1-1/+1
2016-01-05[484577] Make sure 'requires' are on the same sideLaurent Delaigue3-9/+40
2015-12-04[479449] Raise conflict for addition to single-valued containment refPhilip Langer1-8/+51
2015-12-03[480395] Avoid calling EcoreUtil.getURI() as much as possible.Laurent Goubet1-9/+9
2015-10-27Revert "[480437] Missing Diff in diagram conflict delete vs coordinateAxel Richard1-2/+4
2015-10-27[480437] Missing Diff in diagram conflict delete vs coordinate changeAxel Richard1-4/+2
2015-10-22[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard2-28/+53
2015-10-22[478539] Refining conflicted diff doesn't show sub-diffs.Axel Richard1-1/+2
2015-10-21[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard2-2/+17
2015-10-19[475586] Reject sub-diffs of rejected diffs when cascading filter is onAxel Richard4-7/+133
2015-10-15Extract EMFCompareConfiguration from EMFCompareRCPUIPluginMathieu Cartaud7-89/+434
2015-10-05[478620] Cherry pick operation hangsAlexandra Buzila1-7/+31
2015-09-29[477767] Introduce new MatchingStrategy for models shared with git3.2.0M2Axel Richard3-10/+93
2015-09-24Manage move of empty papyrus resourcesLaurent Delaigue3-22/+217
2015-09-24[464739] ResourceLocationChanges become ResourceattachmentChanges.MOVEAxel Richard6-80/+73
2015-09-24[476207] Handle Move kind for ResourceAttachmentChangesAxel Richard3-16/+55
2015-09-18[477607] Fix erroneous conflict detection on uncontrolLaurent Delaigue1-12/+43
2015-09-10[464379] Invert resource matching strategiesLaurent Delaigue1-1/+1
2015-09-03[476363] Replace existing resource when creating new onesPhilip Langer1-3/+27
2015-09-02[475401] Sort resources before matching in StrategyResourceMatcherStefan Dirix1-1/+27
2015-09-02[475401] Modify RootIDMatchingStrategy to only return unique mappingsStefan Dirix1-20/+160
2015-08-18Bump version for neon M1Laurent Goubet2-2/+2
2015-08-18Closing internal package from APILaurent Goubet1-1/+1
2015-07-31Only mark conflicting files as conflicting instead of the whole modelLaurent Goubet1-3/+108
2015-07-30[470268] Consider potential renames in model resolutionPhilip Langer1-0/+1
2015-07-28[473730] Ignore type descriptions within URIsStefan Dirix1-2/+26
2015-07-10Functional tests for the threaded model resolvingLaurent Goubet1-0/+16

Back to the top