| commit | d0eb2f08d3ee8ecff54d068a8747ccee5bd69ff3 | [log] [tgz] |
|---|---|---|
| author | Laurent Goubet <laurent.goubet@obeo.fr> | Tue Jun 28 15:00:48 2016 +0200 |
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | Tue Jul 12 16:49:53 2016 +0200 |
| tree | a2af67873220c00540d5e028b9f5e93b66f0aa40 | |
| parent | 4a548a2ac74e3622bac8c0e08c2e5bcfa12de513 [diff] |
Do not consider a container deletion to conflict with unsets under it Since a containment deletion and the "unset"(s) under it were seen as a pseudo conflict with each other, we were "hiding" the deletion from view and preventing the merge altogether. This adds an explicit dependency between the core tests and objenesis to avoid failures when launching the build locally (mockito has a transient dependency to objenesis). Change-Id: I8d00c336285480962499d861575815f1c4b72b3d