Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare
AgeCommit message (Expand)AuthorFilesLines
2014-12-07[451365] Adds specific handling of opaque action, behavior & expressionPhilip Langer2-2/+34
2014-12-04[442897] Pseudo conflicts under Real Add conflictsAxel Richard2-2/+62
2014-12-03[453749] Fix NullPointer when handling Non-Containment FeatureMapsStefan Dirix1-5/+9
2014-11-18[441172] Extend findMasterEquivalence to not only check eOppositesStefan Dirix2-24/+157
2014-11-17[450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMapsStefan Dirix1-1/+30
2014-11-11[451048] Avoids IllegalArgumentException for custom diff typesPhilip Langer1-2/+4
2014-11-07Various API issuesLaurent Goubet8-7/+15
2014-11-07Fix the "copy all non-conflicting" actionsLaurent Goubet2-4/+18
2014-11-04Suppress warnings on diff_match_patch and relax null analysisLaurent Goubet2-3/+13
2014-11-04[446252] Issue with feature ordering when merging FeatureMapsAlexandra Buzila2-30/+109
2014-10-29[448464] Source list incorrectly determined when undoing changesAlexandra Buzila1-2/+3
2014-10-27[446947] Adds support for three-way merging multi-line String attributesPhilip Langer5-2/+3299
2014-10-21[448120] Adds FeatureMapChangeSpec with a useful toString() methodPhilip Langer2-4/+160
2014-10-20[441172] Fix merge order of equivalent diffs for one-to-one oppositesStefan Dirix3-52/+203
2014-10-14[446739] Fixes obtaining the target feature in three-way merge of a movePhilip Langer1-12/+20
2014-10-10Pre-merge from EMF logical mergingLaurent Goubet3-0/+957
2014-10-10Modify merge to handle implications properlyLaurent Goubet5-200/+485
2014-10-08Optimize dice coefficient storing bigrams within intsLaurent Goubet1-13/+24
2014-10-08Consider potential duplicates in String similarityLaurent Goubet1-18/+76
2014-10-02Bumping minor for all plugins/features changed since Luna SR13.1.0M2Axel Richard2-2/+2
2014-09-25[443031] Fix NPE on FeatureFilter.referenceIsSetAxel Richard1-2/+2
2014-09-25[443968] Fix NPE in ComparisonUtils.getSubDiffsAxel Richard1-1/+3
2014-09-25[443504] Fix computation of ignored elements when finding insertion idxPhilip Langer1-87/+124
2014-09-19[444351] Fix bug in EqualityHelper.matchingArraysAxel Richard1-1/+1
2014-08-24[442439] Fixes DiffUtil.getSourceList for moved and reordered elementsPhilip Langer1-11/+17
2014-08-22Fix merge-related UI feedback of the Structure viewerLaurent Goubet4-265/+247
2014-08-20[441258] Prevents IllegalArgumentException on merging movesPhilip Langer1-32/+93
2014-08-20Only merge the 'many' side of an equivalence in case of additionsLaurent Goubet2-58/+59
2014-08-19[434621] Correction on RootIDMatching strategy.Arthur Daussy1-2/+5
2014-08-05[413520] Fixes IndexOutOfBoundsException on merging opposite referencesPhilip Langer1-2/+59
2014-07-31[440679] Avoids NPE when performing a movePhilip Langer1-51/+113
2014-07-18created parent module for bundles and features to factorize pom definitionsMikaël Barbero1-12/+3
2014-07-17Reworked Maven buildMikaël Barbero1-0/+9
2014-07-17remove unneeded directives in some pom.xmlMikaël Barbero1-9/+0
2014-07-07FeatureMaps: Handle FeatureMapChange differencesAxel Richard18-86/+1438
2014-07-03FeatureMaps: Add new Diff: FeatureMapChangeAxel Richard16-58/+698
2014-07-01Bump versions to 3.1.0 on masterLaurent Goubet1-1/+1
2014-06-03various sonar violations fixes3.0.0RC3Laurent Goubet2-11/+8
2014-06-02Merge "[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredBy"Mikael Barbero1-17/+14
2014-06-02Add Guava 15 to the accepted rangeLaurent Goubet1-4/+4
2014-05-28[434828] Test Merge Conflict Diff With Conflicting Diff With RequiredByAxel Richard1-17/+14
2014-05-28Add support for a new content viewer to fallback to file content mergeMikaël Barbero1-2/+56
2014-05-28[434822] Conflict between move and deleteArthur Daussy3-35/+124
2014-05-25Initialize the diagnostic of the scope.Mikaël Barbero1-0/+3
2014-05-23[435365] CascadingFilter shouldn't filter out changes in moved objectsArthur Daussy1-2/+9
2014-05-21[435376] Conflicted subdiffs shouldn't be merged when CascadingFilter isAxel Richard1-1/+17
2014-05-16Improve robustness against errorMikaël Barbero4-22/+66
2014-05-07[434200] Accept/Reject difference fails in some casesAxel Richard1-9/+28
2014-05-05Add pseudo conflict diffs to the required consequences shown in UIAxel Richard2-3/+42
2014-04-17Add equivalences to the required consequences shown in UIAxel Richard1-0/+19

Back to the top