| commit | 40bdc32e1427af7253a501fca0d9ce7c2bf137cb | |
| author | Laurent Delaigue <laurent.delaigue@obeo.fr> | |
| Wed, 25 May 2016 15:03:57 +0000 (25 17:03 +0200) | ||
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | |
| Tue, 31 May 2016 08:38:15 +0000 (31 10:38 +0200) | ||
| tree | c7fca543903add51b0edd9a45ef60a5dfab018c6 | treesnapshot (tar.gz zip) |
| parent | ba05fbe16ff981d81606211525810ed4c8b32648 | commitdiff |
[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>
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>
14 files changed: