Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-12Do not consider a container deletion to conflict with unsets under itLaurent Goubet1-1/+1
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
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud3-40/+40
Format all non generated classes to get ride of formatter incompatibilities Migrate checkstyle config for checkstyle 6.19 Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
2014-03-13normalize EOLs in the core (first pass)Laurent Goubet6-428/+428
Change-Id: Id5b351cc3c89777401f672c85abb46560ee461b3
2014-01-30Cleanup for version bumpingLaurent Goubet1-1/+2
- Bump versions to reflect minimal BREE change - Fix as many warnings as possible - Make sure our @since reflect the correct versions Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
2013-07-16Refactor Groups.Mikaël Barbero3-201/+104
-IDifferenceGroup are now Adapters. -Use TreeNode as new ItemProviders instead of EDiffNodes. -Add a new Group: By Resource. Change-Id: I26b451997ce42ce37cee266bb0d9e80c07287984
2013-06-20Missing copyrights, typoLaurent Goubet1-0/+10
Change-Id: I920fd45c0d8011c25fcd5f65705dbe2402bb2e9d
2013-06-19Deprecate use of EMFCompare#createDefaultScope(...)Laurent Goubet1-1/+2
Change-Id: Ie4af0c2180a6df04bad8edeba038e6dd1141cf63
2013-04-08Typo, useless suppress warningLaurent Goubet2-43/+43
2013-03-07[401659] New filters and trees under groupsAxel Richard3-564/+564
Display the tree structure of the model below each group. Add new filters : * Identical elements : hide elements with no differences * Pseudo conflicts elements : on a 3-way comparison, hide elements that has been made on both side. * Pseudo delete conflicts elements : on a 3-way comparison, hide deleted elements that has been made on both side. * Sub diff elements : hide differences under differences. * Uml refined elements : hide all uml elements refined by another diff. * Diagram (Gmf) refined elements : hide all gmf elements refined by another diff. Remove filters : Addes, Removes, Changed, Moved Remove Group : By Metaclass Bug: 401659 Change-Id: I97f4bcf6a2f4dc4fadec42a55c6b8adec574f536
2012-11-12add few more ItemProvider #getChildren testsMikaël Barbero1-1/+94
2012-11-09add some test for compare.edit (esp. getChildren() of ItemProvider)Mikaël Barbero11-0/+975

    Back to the top