Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2016-05-25 15:03:57 +0000
committerLaurent Delaigue2016-05-31 08:38:15 +0000
commit40bdc32e1427af7253a501fca0d9ce7c2bf137cb (patch)
treec7fca543903add51b0edd9a45ef60a5dfab018c6 /plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
parentba05fbe16ff981d81606211525810ed4c8b32648 (diff)
downloadorg.eclipse.emf.compare-40bdc32e1427af7253a501fca0d9ce7c2bf137cb.tar.gz
org.eclipse.emf.compare-40bdc32e1427af7253a501fca0d9ce7c2bf137cb.tar.xz
org.eclipse.emf.compare-40bdc32e1427af7253a501fca0d9ce7c2bf137cb.zip
[493650] Fix order of merged children
Improved after discussion with Laurent Goubet. A test is added to check that when merging every diff and resolving conflicts by: - first reject all target side conflicting diffs - then accepting all other diffs yields models to be identical on both sides, no matter in what order the diffs are accepted/rejected. The test uses Collections2.permutations, which appeared in guava 12, so an update of the TP was necessary. Bug: 493650 Change-Id: Ib790b992184f6038806bf890f7af96ae2c447ca7 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
index aca9bd2f7..2c092f71b 100644
--- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
@@ -54,7 +54,7 @@ Export-Package: org.eclipse.emf.compare.tests,
org.eclipse.emf.compare.tests.scope,
org.eclipse.emf.compare.tests.suite,
org.eclipse.emf.compare.tests.unit
-Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
- com.google.common.cache;version="[11.0.0,16.0.0)",
- com.google.common.collect;version="[11.0.0,16.0.0)"
+Import-Package: com.google.common.base;version="[12.0.0,16.0.0)",
+ com.google.common.cache;version="[12.0.0,16.0.0)",
+ com.google.common.collect;version="[12.0.0,16.0.0)"
Bundle-ActivationPolicy: lazy

Back to the top