Skip to main content
diff options
authorLaurent Delaigue2016-05-25 15:03:57 +0000
committerLaurent Delaigue2016-05-31 08:38:15 +0000
commit40bdc32e1427af7253a501fca0d9ce7c2bf137cb (patch)
treec7fca543903add51b0edd9a45ef60a5dfab018c6 /plugins/
parentba05fbe16ff981d81606211525810ed4c8b32648 (diff)
[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 <>
Diffstat (limited to 'plugins/')
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ b/plugins/
index aca9bd2f7..2c092f71b 100644
--- a/plugins/
+++ b/plugins/
@@ -54,7 +54,7 @@ Export-Package:,,,
Bundle-ActivationPolicy: lazy

Back to the top