Skip to main content
AgeCommit message (Collapse)AuthorFilesLines
2019-08-30Fix diff, conflict detection and merging of non-unique attributeslgoubet39-41/+442
Non-unique multi-valued attributes had been completely ignored during the conception of EMF Compare and thus every step of the process was failing. Change-Id: I09c7ff8cf3eee5fff6c76128a3142a29acb15987
2014-12-16Adds new node types in the "Nodes" metamodel to test EEnumArthur Daussy11-9/+1190
Change-Id: I34886ceb588f47d0844ca174c5f2573f5ac09afa
2014-09-25[443031] Fix NPE on FeatureFilter.referenceIsSetAxel Richard8-97/+688
Fix NPE on FeatureFilter.referenceIsSet Add tests Bug: 443031 Change-Id: Id2ecebcff6c174341199451d472aad4c06101239 Signed-off-by: Axel Richard <>
2014-08-13Do not use == to compare primitive types wrapper objectMikaël Barbero1-8/+9
Change-Id: I13ced799113e2896ba1ebbd6fd536c7c649e493a
2014-08-13Do not use assertSame for int comparisonMikaël Barbero20-60/+40
Change-Id: Ia66b0f5d243f33e5aca11f807f4c13359e276a09
2014-07-07FeatureMaps: FeatureMapChanges testsAxel Richard10-1/+1203
Add feature map element in nodes.ecore Add core tests Change-Id: I61becd6b8f28cb8f494951493e8367759eaa2e4b
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet28-5511/+5511
Change-Id: Id5b351cc3c89777401f672c85abb46560ee461b3
2014-01-30Cleanup for version bumpingLaurent Goubet16-81/+75
- Bump versions to reflect minimal BREE change - Fix as many warnings as possible - Make sure our @since reflect the correct versions Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
2013-06-20Missing copyrights, typoLaurent Goubet2-0/+20
Change-Id: I920fd45c0d8011c25fcd5f65705dbe2402bb2e9d
2012-09-25Make sure that the test metamodel honours the "resolve proxy" setting.lgoubet7-180/+88
2012-09-17Update metamodel tests with the new conceptslgoubet13-66/+966
2012-08-02Add missing copyright information.lgoubet16-0/+160
Replacing BufferedCanvas with the AbstractBufferedCanvas that was used by EMF Compare 1.
2012-06-18Disabling compiler warnings :lgoubet3-0/+6
- Method can be static - Unnecessary else
2012-05-30Implementation of the equivalence processing.Cedric Notot12-110/+1884
2012-05-11Fixing detection of some yet undetected diffs.lgoubet5-100/+91
Adding tests for a number of conflict use cases. Fixing the detection of the problematic use cases.
2012-05-10Modification of the name of the reference Diff.equivalentDiffs toCedric Notot1-0/+8
2012-05-03Contributing test metamodel wit the necessary "specific" features (multiple ↵lgoubet22-0/+3815
containment features, single-valued containment, multi-valued attribute...) and its generated code.
2012-03-22First implementation of the diff engine : detects containment changeslgoubet1-12/+12
and some of the possible reference changes.
2012-03-13Introduce the new versions of the metamodel and tests for the EMF Compare core.lgoubet16-0/+3824
2012-03-12Move all features and plugins that will be deprecated by the incoming ↵lgoubet49-9865/+0
restructuration into a separate folder.
2012-03-06Use the system's temporary directory instead of on located in thelgoubet1-27/+8
2012-03-05[294336] Including Stephen McCants' unit tests.lgoubet29-0/+6282
2012-03-05Adding 2012 to EMF Compare's copyright noticeslgoubet20-40/+40
2011-08-05Regenerating test metamodel in order to introduce the new conceptslgoubet4-0/+437
needed for the "single-valued reference" merge use cases.
2011-08-05Regenerating test metamodel in order to introduce the new conceptslgoubet6-9/+384
needed for the "single-valued reference" merge use cases.
2011-08-04Enhancing "test" metamodel with single and multi-valued attributeslgoubet10-0/+815
2011-08-02Create and generate the code of a custom metamodel for the merge tests.lgoubet12-0/+1975

    Back to the top