Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2016-05-25 11:03:57 -0400
committerLaurent Delaigue2016-05-31 04:38:15 -0400
commit40bdc32e1427af7253a501fca0d9ce7c2bf137cb (patch)
treec7fca543903add51b0edd9a45ef60a5dfab018c6 /org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
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 'org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target')
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target5
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
index 08034aba1..dcde290f5 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Helios SDK" sequenceNumber="1436775869">
+<target name="EMF Compare based on Helios SDK" sequenceNumber="1464676195">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+ <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+ <unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="javaewah" version="0.7.9.v201401101600"/>

Back to the top