Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-07-19change the MatchItemProvider that give containment change diff as childMikaël Barbero12-91/+281
2012-07-17hide pseudo conflictsMikaël Barbero1-7/+31
2012-07-17another step toward the new implementation of the EMFCompare UI v2 (addMikaël Barbero14-66/+1799
2012-07-13update for 4.2 releaseMikaël Barbero1-10/+8
2012-06-27added null test against no match foundMikaël Barbero1-1/+5
2012-06-27removed reference to o.e.compare internal codeMikaël Barbero1-2/+2
2012-06-27fix potential NPEMikaël Barbero1-3/+15
2012-06-26Guard against potential failureslgoubet1-4/+9
2012-06-26Use an ECrossReferenceAdapter instead of a stupid map for thelgoubet3-34/+124
2012-06-21Commiting the last individual tests for merge operations.lgoubet3-9/+982
2012-06-20Adding tests for all individual diffs that can be detected onlgoubet43-14/+2088
2012-06-18Renaminglgoubet2-3/+3
2012-06-18Disabling compiler warnings :lgoubet29-53/+50
2012-06-15Add merge support for Attribute changes.lgoubet5-99/+651
2012-06-15Removing factory_override, using the simple generation-gap patternlgoubet4-103/+9
2012-06-15Fixing Cedric's Choco-pushlgoubet1-2/+3
2012-06-15Adding a number of unit tests for the merge operations.lgoubet6-133/+939
2012-06-13Post processing implementationCedric Notot22-17/+1163
2012-06-12Placing TODOlgoubet1-0/+1
2012-06-08Should now handle the merging of CHANGE diffs for Reference valueslgoubet1-135/+115
2012-06-08Avoid needless recursion and list creations.lgoubet2-3/+25
2012-06-08Avoiding costly list operationslgoubet1-29/+5
2012-06-07Implementation of new requirements rulesCedric Notot16-242/+1171
2012-06-07First draft of the merge implementation. We now handle merging of the Referen...lgoubet41-1061/+2669
2012-06-04added content merge viewer for many reference changesMikaël Barbero14-137/+477
2012-06-04filters out root matches with no diff Mikaël Barbero2-14/+37
2012-06-01Boyscout : removing warningslgoubet7-11/+7
2012-06-01React to changes introduced by CBR with the EqualityHelperlgoubet3-65/+113
2012-06-01Acting the change to CRLF since all projects' settings set this as the file d...lgoubet104-3228/+3948
2012-06-01This test cannot pass yetlgoubet1-0/+2
2012-06-01A few APIs changes :cbrun7-51/+92
2012-05-31add consistency in markers displayed in the UIMikaël Barbero19-135/+676
2012-05-31added Arrays.fill()ing of blank spaceMikaël Barbero1-0/+3
2012-05-30Implementation of the equivalence processing.Cedric Notot94-142/+3879
2012-05-30Use of EcoreUtil.CrossReferencer and equivalence computing developmentCedric Notot13-35/+377
2012-05-30Add of the possibility to re-use an external cross referencer for theCedric Notot1-2/+20
2012-05-30Optimization to look for outgoing references from an eobject.Cedric Notot2-3/+6
2012-05-30So far when comparing two EObjects the matcher was not called with the root E...cbrun1-3/+6
2012-05-22Basic testing of the LCS algorithmlgoubet3-3/+106
2012-05-21Removing outdated FIXME : the default diff engine now considers orderinglgoubet1-1/+0
2012-05-21Commentinglgoubet1-64/+31
2012-05-21Adding the missing conflict unit tests.lgoubet32-110/+1207
2012-05-16Fixing conflict detection for the remaining use cases.lgoubet19-610/+1582
2012-05-11Improving a little more the conflict detection.lgoubet7-31/+649
2012-05-11Fixing detection of some yet undetected diffs.lgoubet10-114/+370
2012-05-10Conflict detection for all single-valued features is now functional and tested.lgoubet5-35/+512
2012-05-10Adding the concept of pseudo-conflicts to the metamodel.lgoubet11-13/+529
2012-05-10Resolving useless imports warningslgoubet2-2/+0
2012-05-10Adding the notion of "pseudo-conflicts" to the diff engine.lgoubet3-5/+52
2012-05-10We now detect changes for "identical deletions" on each side.lgoubet10-86/+719

Back to the top