)]}' { "log": [ { "commit": "e08da952d4dfc7b10f640dfc7dedba781dda7398", "tree": "9e5e566381cd1762295e880d4bf1f41de1220aa3", "parents": [ "9514c6b028ea25cf80e9442c5a5fe991fb041658" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 20 14:25:23 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 20 14:25:23 2021 +0200" }, "message": "change visibility of the resolution context\n\nChange-Id: I87299000aab20d8bc6de2d7afc59ddae35f2eb58\n" }, { "commit": "9514c6b028ea25cf80e9442c5a5fe991fb041658", "tree": "45b5935ba446042cb20f5a86df5624970e530550", "parents": [ "b0f39dab91c6333f0cec5445073cf02e1c041695" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jul 19 10:21:37 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jul 19 16:29:54 2021 +0200" }, "message": "Bump version to 3.3.15\n\nChange-Id: I88821e55645333caf9b8e6c81a8203866f2f40d8\n" }, { "commit": "b0f39dab91c6333f0cec5445073cf02e1c041695", "tree": "9922a2df4854f1ce825f0f93860b31cf1a024a25", "parents": [ "ee57472debac0944840b4b521194608c4f3f0e72" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jul 19 16:29:03 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jul 19 16:29:54 2021 +0200" }, "message": "Enable diagram post processor for GMF 1.10 and above\n\nChange-Id: Ie3835b5970c65db6328adaa0fcf08a593db1f452\n" }, { "commit": "ee57472debac0944840b4b521194608c4f3f0e72", "tree": "e9ca8b86349c074126b0f65af639902012993757", "parents": [ "2f5b968816d2d8dcc82762f1d82cd8f0a5ff3958" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 15:17:20 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 15:17:20 2021 +0200" }, "message": "Fix release script\n\nChange-Id: If38ee0068df2b4bd9b8fb3c4167bc12d0c5b6cba\n" }, { "commit": "2f5b968816d2d8dcc82762f1d82cd8f0a5ff3958", "tree": "38e3e8dc11b4d99bb2a4f9980e84ce15049d9ee5", "parents": [ "434b42bfb42123875c840263f6ca89ca732e2b9f" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 15:13:48 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 15:13:48 2021 +0200" }, "message": "fix release publication script\n\nChange-Id: I8a8b6358981b0bd6a2c4e64d3b34eb909896b622\n" }, { "commit": "434b42bfb42123875c840263f6ca89ca732e2b9f", "tree": "00e8beba378c156a8d4557c4956db7547337fc7c", "parents": [ "384248566a4dff04966a1e736564d2d871712941" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 14:48:55 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 14:48:55 2021 +0200" }, "message": "Add script to publish releases for JIRO\n\nChange-Id: I67d83d03f73234775200dd9f5ff93a9153ac9b60\n" }, { "commit": "384248566a4dff04966a1e736564d2d871712941", "tree": "64afc1792681ccbd390c08bc51759b39703e4963", "parents": [ "a8ce42be598ac6b8cc4c4e4d20411c680cbd025a" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Jul 15 11:10:36 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 14:21:06 2021 +0200" }, "message": "Fix delete-change conflict detection (at file level)\n\nRemoving a file locally and changing it remotely should be seen as a\nconflict by EMF Compare, but since we were using the local traversal\n(empty since the file has been removed) as starting point, we were not\nable to resolve the remote files either, ending up in an empty\ncomparison because of missing file variants.\n\nChange-Id: I279ea3cd3b30fa65cc5a244917685e76d42e0f81\n" }, { "commit": "a8ce42be598ac6b8cc4c4e4d20411c680cbd025a", "tree": "8a0a8f563a0deedf47578ef2d89ec7b3ce0265e2", "parents": [ "2fec5a7e3f8e5474de1a49ccbd32c3ffbdc42421" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Apr 28 09:57:14 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 14:21:06 2021 +0200" }, "message": "Prevent NPE from the title builder job if run during/after disposal\n\nChange-Id: Ia059bcfb8ae2d21fd3a096cf0b70226394013788\n" }, { "commit": "2fec5a7e3f8e5474de1a49ccbd32c3ffbdc42421", "tree": "315ca0971b80ba39192e8efe1621e08f625bbbda", "parents": [ "635eb1ff7156b0e6abb70be8ddc92d8c96ab10e5" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Jul 15 15:28:31 2021 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jul 16 14:21:05 2021 +0200" }, "message": "Switch to 2021-06 tp and latest EGit version\n\nChange-Id: Id37e22c45b68e80c516ca4d3b9c4d48b80ada113\n" }, { "commit": "635eb1ff7156b0e6abb70be8ddc92d8c96ab10e5", "tree": "f254a6e054391ef668e21e6844b5f2c0223d5188", "parents": [ "515be828e5beabc477b78ce095e7d13b446f495b" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 18:30:06 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 18:30:06 2021 +0100" }, "message": "Use Unix line delimiters for shell scripts\n\nChange-Id: Ic40136f0dcbef3ade9e64e4b688de8a8da8abae0\n" }, { "commit": "515be828e5beabc477b78ce095e7d13b446f495b", "tree": "96ce564603b0d3f827f6c31d7b9aaaac9db7157c", "parents": [ "4fed9d27b16ec2c5d119244dc8507f7e2d044bdf" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 17:54:13 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 17:55:27 2021 +0100" }, "message": "Add script to publish milestones for JIRO\n\nChange-Id: I78a42c8171c21d433d101e3ed6ddc60dfea19a1c\n" }, { "commit": "4fed9d27b16ec2c5d119244dc8507f7e2d044bdf", "tree": "7984bdb6c9ea5effcfdb7ccb3fcea9411f25d9d8", "parents": [ "0715cae3c43cde3cfb3f4f078b50a455c0f6a145" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 16:23:58 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 16:24:06 2021 +0100" }, "message": "Add nightly publication script for JIRO\n\nChange-Id: Ic1847c4ecf2b198b7d823f19db87ff6c9e993e49\n" }, { "commit": "0715cae3c43cde3cfb3f4f078b50a455c0f6a145", "tree": "b7e6f5d2d7e844d8bd69808acf1a55b6c320498f", "parents": [ "28b6218065d50198a622faa22c1c2d165ced2e5c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Feb 22 18:17:46 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Feb 23 09:47:20 2021 +0100" }, "message": "Open ranges to accept Guava 30.1\n\nChange-Id: I6c300457809998bc99fda509ecb1a2d09877172a\n" }, { "commit": "28b6218065d50198a622faa22c1c2d165ced2e5c", "tree": "53d9e7886052cc463da2d8aac7296e6d42d79ad7", "parents": [ "85eb79ce8fc00cc9370d7a54cab3e894f1f1ce3d" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Feb 08 15:00:00 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Feb 08 15:00:00 2021 +0100" }, "message": "Bump version to 3.3.14\n\nChange-Id: I816ee958ca706dac4af8ff03ce6ad520ef4264d7\n" }, { "commit": "85eb79ce8fc00cc9370d7a54cab3e894f1f1ce3d", "tree": "aa99ae64987a2f238c0f81b6bf38f48084fe8e7f", "parents": [ "b94c8288c2a988e7042b24693085bb28ed44c4e3" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Feb 08 11:04:34 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Feb 08 11:17:28 2021 +0100" }, "message": "Do not close the repository when creating the EMF merge tool\n\nChange-Id: Ie1fc993cefea8b8e4f94e5a0114ed6e5f1150208\n" }, { "commit": "b94c8288c2a988e7042b24693085bb28ed44c4e3", "tree": "7e8f150da50dfd3ec38de18f1d62fd91c6391409", "parents": [ "d26772c93995564d8e6ae88e0d18a28df27392a7" ], "author": { "name": "Eike Stepper", "email": "stepper@esc-net.de", "time": "Mon Jan 25 18:16:46 2021 +0100" }, "committer": { "name": "Eike Stepper", "email": "stepper@esc-net.de", "time": "Mon Jan 25 18:17:27 2021 +0100" }, "message": "[570625] Provide overridable isTransient(EStructuralFeature) method in FeatureFilter\n\nhttps://bugs.eclipse.org/bugs/show_bug.cgi?id\u003d570625\n\nChange-Id: Ice51014488274b802770175ce38a10251045e8ff\nSigned-off-by: Eike Stepper \u003cstepper@esc-net.de\u003e" }, { "commit": "d26772c93995564d8e6ae88e0d18a28df27392a7", "tree": "3d96ce833ed5a363851ffc4816b7b96194fc9f56", "parents": [ "97068e5f6a8220b435d91641296107e4a1f9d8d8" ], "author": { "name": "Axel RICHARD", "email": "axel.richard@obeo.fr", "time": "Thu Jan 07 10:16:07 2021 +0100" }, "committer": { "name": "Axel RICHARD", "email": "axel.richard@obeo.fr", "time": "Thu Jan 07 10:16:07 2021 +0100" }, "message": "Fix potential NPE\n\nChange-Id: Ica3669bad719f5d553567ac0072ef2393d213391\nSigned-off-by: Axel RICHARD \u003caxel.richard@obeo.fr\u003e" }, { "commit": "97068e5f6a8220b435d91641296107e4a1f9d8d8", "tree": "6293495de0a0aef76cd8feb07be0a8e850c63dcf", "parents": [ "cc190c9784ab5ee7b3e2ceb3bbb588a9097fe3f1" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 05 19:12:20 2021 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 05 19:12:20 2021 +0100" }, "message": "Potential NPE\n\nChange-Id: Ib432d64df5fb4a1174d2fd7fc9c9f60c56d4d03a\n" }, { "commit": "cc190c9784ab5ee7b3e2ceb3bbb588a9097fe3f1", "tree": "716d11c7ed47d0e334314cbf54abe4dbe8a0002c", "parents": [ "31fab8da9a42ad87a7147bb9a4e29784ff634fcb" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Nov 24 15:21:06 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Nov 24 15:21:06 2020 +0100" }, "message": "Make sure folders are created when extracting input files\n\nChange-Id: Id1daac07074ad73963c01f9f7af80936d8ab4125\n" }, { "commit": "31fab8da9a42ad87a7147bb9a4e29784ff634fcb", "tree": "41f92c24e30568c9f45e396dd9df567029d9cd07", "parents": [ "6b1e4f729ddd590ab23d5ee00c3e0933597143a2" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Nov 20 10:13:27 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Nov 20 10:13:27 2020 +0100" }, "message": "Bump versions to 3.3.13\n\nChange-Id: I94d1117a9210201e90ad2b37f4dc5e8607dfb970\n" }, { "commit": "6b1e4f729ddd590ab23d5ee00c3e0933597143a2", "tree": "e4ba17aa89114028bda05e5ad8058146d1e1cb16", "parents": [ "e523511d615f4b9fe546867d303f7a645e4f44af" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Nov 19 16:34:08 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Nov 19 16:34:08 2020 +0100" }, "message": "Do not close the repository, getRepositoryCache().clear() will do it\n\ncalling \"close\" twice on the same repository is considered a failured\nby JGit...\n\nChange-Id: I1852cf1bcc03458e654588d28dcb957b4a66f89b\n" }, { "commit": "e523511d615f4b9fe546867d303f7a645e4f44af", "tree": "d08256b11fd18df6488a0f41705e16fdc9107863", "parents": [ "047cab3def4d7df42402519bd84cb6aa3736d9f1" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Oct 21 09:19:44 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Oct 21 09:19:44 2020 +0200" }, "message": "Allow loading of models using ID attributes for comparison\n\nChange-Id: Ib999a1e0764a64c667d2af2534e63a73a8d67999\n" }, { "commit": "047cab3def4d7df42402519bd84cb6aa3736d9f1", "tree": "7d35d7687b48da2e61ce8dd657a767675cb427b5", "parents": [ "92126dfa0705d1aabde91708ba6e2157d1b9652e" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Oct 21 09:19:25 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Oct 21 09:19:25 2020 +0200" }, "message": "Compatibility recent mockito\n\nChange-Id: I39cce80978d33b0b2c30ddba955a6c92a4b27f10\n" }, { "commit": "92126dfa0705d1aabde91708ba6e2157d1b9652e", "tree": "ca997e988dd4195213652fb9288462963a3dc42a", "parents": [ "25ae3615daa64fc8f74c423671d1cc3b1f02c399" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Sun Oct 04 14:00:19 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Sun Oct 04 14:00:19 2020 +0200" }, "message": "Only consider files we\u0027ve extracted as potential test projects\n\nChange-Id: Ia95ea72e7e08b5b740c6ec4d48c3efc319f13f22\n" }, { "commit": "25ae3615daa64fc8f74c423671d1cc3b1f02c399", "tree": "9bea444097a85c1bbcf600d38b2c8189390ce024", "parents": [ "6926c74d1c41c07ab174bfcbc648c0612e980317" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 31 14:47:41 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 31 14:47:41 2020 +0200" }, "message": "Delete sub-projects first when cleaning up test workspace\n\nChange-Id: I4ab448ed6b81e139cc8a1fc44cc296c8ee186625\n" }, { "commit": "6926c74d1c41c07ab174bfcbc648c0612e980317", "tree": "86cde98000d9e68197ccc3571a039114a43790fe", "parents": [ "a6412a1e984be5de8a167aeb3d14309e3dc87d2e" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 22 17:15:21 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 22 17:15:21 2020 +0200" }, "message": "Bump Versions to 3.3.12\n\nChange-Id: I48bc3f0edd7cbc87c97ca99daaa918e9f9a7fe4b\n" }, { "commit": "a6412a1e984be5de8a167aeb3d14309e3dc87d2e", "tree": "b403cf45345ec137141ae12cb4bc5e888d43959a", "parents": [ "8314994caf2d20b9a0f8a32367d97f089f488e41" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jun 26 13:02:26 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 22 17:12:35 2020 +0200" }, "message": "Fix name of 2019-12 target platform\n\nChange-Id: I92f7dd5f965208045b7b68245344f5f0d13f79d8\n" }, { "commit": "8314994caf2d20b9a0f8a32367d97f089f488e41", "tree": "bc6e5847030399349f3968dc46e831a966278053", "parents": [ "4b376fac511db1366e9bf505e076ab398ec224fc" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Thu May 14 14:24:40 2020 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 01 10:45:34 2020 -0400" }, "message": "[564680] Improved diagram display.\n\nWhen merging a deletion of a Sirius element, the diagrams disappear from\nthe content merge viewer and are replaced by a white background. This is\ndue to the DiagramMatchAccessorImpl#getDiagram(MergeViewerSide) method,\nwhich did not correctly find the diagram associated with a deleted\ngraphical element.\n\nBug: 564680\nChange-Id: I48151683490f9617b661d7ae703bd4058838a30f\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "4b376fac511db1366e9bf505e076ab398ec224fc", "tree": "50a38c6b257f8351ca4707ea179bd2084d4ec819", "parents": [ "991266d5ed024d4d3c00e51a71a86c88ba45b4c9" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Thu May 14 14:24:40 2020 +0200" }, "committer": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Tue Jun 30 16:56:28 2020 +0200" }, "message": "[564658] New Feature : Export Diagram Comparison as images.\n\nA new feature to export a diagram comparison as images. The\nimage is formed by the two compared diagrams with their phantoms and\nmarkers, the two diagrams are separated by a black separator.\n\nBug: 564658\nChange-Id: I762359439cfeaf25a4f449d852c8e4ec7c1138f2\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "991266d5ed024d4d3c00e51a71a86c88ba45b4c9", "tree": "3e67fe06ca5f5053760a3207f5905a5e2422a1d9", "parents": [ "f6a63eebf478bf5753818d9c1a0c58ad96d49a61" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jun 26 11:49:11 2020 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Jun 26 05:54:05 2020 -0400" }, "message": "Fix GitTestSupport\n\nSome tests may create their own projects that are not connected to a\ngit repository\n\nChange-Id: I2a295a3ebfe92c7854d31fb6f8e3e78f281af4b2\n" }, { "commit": "f6a63eebf478bf5753818d9c1a0c58ad96d49a61", "tree": "050b303c339cd1dec18a4ee9078a32ec71a68f5d", "parents": [ "312374ed970d91c7cc8b079f5c9f555e7c6b3e02" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Thu Jun 25 15:36:52 2020 +0200" }, "committer": { "name": "Axel RICHARD", "email": "axel.richard@obeo.fr", "time": "Thu Jun 25 11:06:50 2020 -0400" }, "message": "Update orbit.tpd to resolve new EGit requirement to org.assertj dependency.\n\nChange-Id: I46a17b3378588c0d96bfaa117fbcb0911a444a0b\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "312374ed970d91c7cc8b079f5c9f555e7c6b3e02", "tree": "0fe3a02582352ea05a19d037b5492e14cd12223f", "parents": [ "9c103fdd1eddbbd3323209545ff325481cfaa598" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue May 26 10:29:06 2020 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue May 26 10:29:32 2020 +0200" }, "message": "Bump versions to 3.3.11\n\nChange-Id: I1d5d7ad964242350296a71d8025c55efe57039e0\n" }, { "commit": "9c103fdd1eddbbd3323209545ff325481cfaa598", "tree": "d9bdece1028d0c85d46c7d300e6627a13bf271f5", "parents": [ "99bed8d465f6e4a66fbd1fe11330618bb4953e98" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Fri Apr 17 09:10:05 2020 +0200" }, "committer": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Mon May 11 16:49:32 2020 +0200" }, "message": "[562321] Improved Undo/Redo actions\n\nThe undo action is incomplete when merging a deleted Sirius Node. Undo\nand redo actions use a ChangeRecorder that removes changes to the model\nfrom the .aird file by using the method\norg.eclipse.emf.ecore.change.util.ChangeRecorder#consolidateChanges()\nimmediately after merging the differences.\n\n- The changes made allow to call the consolidateChanges() method, which\ndoes not delete the Sirius changelist.\n- Add test classes for UndoAction, RedoAction, and also for the bug.\n\nBug: 562321\nChange-Id: I83e126ac6e714c70cba9ed2fb2e658c36fab5ecf\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "99bed8d465f6e4a66fbd1fe11330618bb4953e98", "tree": "f4a1db6f2aa9dfb3789833feb8474b33e1f48cef", "parents": [ "ae3c3115d685981f6cc4710b3f24ee8293d5af33" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Thu Apr 09 16:46:31 2020 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Apr 21 05:39:29 2020 -0400" }, "message": "[561825] Merge a Sirius Node doesn\u0027t merge \"actualMapping\" difference.\n\nThe implies/impliedBy relations of Sirius Nodes should not be\nautomatically merged and just noted as \"MERGED\". These differences\nshould be merged just like the others.\n\n- Add a new Merger, SiriusReferenceChangeMerger, to manage these\n\"implies/impliedBy\" relations.\n\n- Add unit tests.\n\nBug: 561825\nChange-Id: If191702dc31ec00cce0410ecc39a0ee3e5dac0dd\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "ae3c3115d685981f6cc4710b3f24ee8293d5af33", "tree": "1d1445c78eab5cf7100d566c45a2b1431ae113df", "parents": [ "4b76fb320ebad00dd97b8e12760fb078622b04c0" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Sun Apr 19 16:53:43 2020 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Apr 21 05:16:50 2020 -0400" }, "message": "Git test framework failing on windows\n\nFileUtils.delete cannot remove read-only files, and some of the files\ncreating by EGit/Jgit within the test repositories (.git/objects files)\nare set as read-only, leading to test failures because we cannot\nclear up the test workspace after each test.\n\nThis also changes the test framework to using try-with-resources where\npotential errors were identified.\n\nChange-Id: Ibfb54584cc7ccdcae09e56abe0b1c79001e68394\n" }, { "commit": "4b76fb320ebad00dd97b8e12760fb078622b04c0", "tree": "22c6f977ab8777c5cf5643eb6c7e78936dcef80c", "parents": [ "797551cdf22e95efb5688a58d2b70f3cb676b83a" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Tue Mar 31 10:38:03 2020 +0200" }, "committer": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Thu Apr 02 10:06:36 2020 +0200" }, "message": "Merge a deleted Sirius node from right to left throws a WrappedException\n\nThe exception is due to incomplete management of \"implies\" relations.\nDeleted DNodes must have an \"implied by\" relation with their mapping,\ninstead of \"implies\". Thus, the mapping difference should not be merged\nfirst.\n\n- Adding \"implied by\" relation in the case of a DELETE\n\n- Generalized mapping set to all DMappingBased instead of DNode\n\n- Creating unit tests\n\n\nBug: 561458\nChange-Id: I8215033d069f2e4effca8e97ced388b5653d663d\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e" }, { "commit": "797551cdf22e95efb5688a58d2b70f3cb676b83a", "tree": "0b0521c9745d2ce150fe38d7919f7c78e2c1675b", "parents": [ "258af3887e37e18f699d81866664e305ad3981ef" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Wed Mar 11 16:20:23 2020 +0100" }, "committer": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Tue Mar 17 16:17:27 2020 +0100" }, "message": "[560861] Swapping content merge viewer don\u0027t swap phantoms\n\nThe target side when revealing phantom decorators don\u0027t return the\ncorrect MergeViewerSide when the compare configuration is mirrored.\n\n- Fix the method PhantomManager#getTargetSide(Match, View)\n\n- Refactor DiagramContentMergeViewer class\n\n- Creating Unit tests\n\nBug: 560861\nChange-Id: I437293113ad2e5fe91ffb4977aaa52c975167d73\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "258af3887e37e18f699d81866664e305ad3981ef", "tree": "bcf374a2707507edc7cc9af35a79a80b3001caf7", "parents": [ "baa974a46a6e066174f537f3086468327639c2bd" ], "author": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Fri Mar 06 14:28:15 2020 +0100" }, "committer": { "name": "Glenn Plouhinec", "email": "glenn.plouhinec@obeo.fr", "time": "Fri Mar 06 14:28:15 2020 +0100" }, "message": "[doc] update User Guide: Change download page link.\n\nChange-Id: I95414ee6d2d5a3607376be023b00dcdad5f7e4e3\nSigned-off-by: Glenn Plouhinec \u003cglenn.plouhinec@obeo.fr\u003e\n" }, { "commit": "baa974a46a6e066174f537f3086468327639c2bd", "tree": "0ea08ec7b9a89a700e007d90f32fafb9876058d0", "parents": [ "4ed9fe86444663861642e724c77cd7ad5de368e5" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 14 10:35:06 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 14 10:35:40 2020 +0100" }, "message": "Bump update sites to 3.3.10\n\nChange-Id: I82d124fb1b2f90585a5b361a456ee746b088c354\n" }, { "commit": "4ed9fe86444663861642e724c77cd7ad5de368e5", "tree": "0eef72fcb22d64e6c1dd7ac88556fc6010a83a3a", "parents": [ "8f8e4c431cf7acc993d8e27515fb1724f9771ce5" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 14 10:13:15 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jan 14 10:13:15 2020 +0100" }, "message": "Bump EMF Compare to 3.3.10 and add 2019-12 target platform\n\nChange-Id: Ib199af36e174aad2b8593bf6702334eab28d4c22\n" }, { "commit": "8f8e4c431cf7acc993d8e27515fb1724f9771ce5", "tree": "8aaae840ab0d71756c0c38daa60c9b696cb3bd7c", "parents": [ "ec64f3cdb674ccf162628f07639f603461363299" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jan 06 11:11:59 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jan 06 11:11:59 2020 +0100" }, "message": "Prevent NPE from the closing of a Comparison Dialog\n\nThe comparison may have already been cleared before we reach\nEMFCompareConfiguration.dispose() when closing a comparison dialog. The\nexact flow to reach this state needs to be investigated\n\nBug: 558505\nChange-Id: I32853c967e0709d060d01a86efb9ad2429116c53\n" }, { "commit": "ec64f3cdb674ccf162628f07639f603461363299", "tree": "f986f0c749f21e679e3d98129d7863ea7ad46caf", "parents": [ "d0cdd0e6d718d05e169aef63107d68f1c6c310f0" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jan 06 10:45:23 2020 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Jan 06 10:45:23 2020 +0100" }, "message": "Compatibility with JGit 5.6.0\n\nChange-Id: I70709e010cfc47461e9f34e34488994b22cb37ff\n" }, { "commit": "d0cdd0e6d718d05e169aef63107d68f1c6c310f0", "tree": "0c03a7af9b85b35e9d5d72b9744e9875f43b47fc", "parents": [ "80863539cb8f61fd75f6f973e5d6cb27bb71d2df" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Nov 05 13:49:43 2019 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Nov 05 15:57:04 2019 +0100" }, "message": "Potential NPE when switching files in the compare dialog\n\nThis would happen when switching from a model file to a textual file\nwhile having the property content merge viewer showing.\n\nChange-Id: Id756a9c135db9849ac073ecb32cfd55bbb29474f\n" }, { "commit": "80863539cb8f61fd75f6f973e5d6cb27bb71d2df", "tree": "481ab42cf4a012268a9e513d0b0ada72d3a04e92", "parents": [ "51941ba55225bf9a877ccb830208d8c01fbd44e6" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 15:09:59 2019 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Nov 05 09:07:17 2019 -0500" }, "message": "Switch EMF Compare to Guava 27\n\nChange-Id: If626ac8982b585d9046cb19ea121c1b361cce586" }, { "commit": "51941ba55225bf9a877ccb830208d8c01fbd44e6", "tree": "d4460d9d92b96b65eb85124180b785f0d8a9656d", "parents": [ "5235efc9323c45431120dc110cbb24cd0c855a9e" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 11:56:50 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 11:56:50 2019 +0200" }, "message": "Re-enable signing and tycho-p2-plugin, switch website to antrun\n\nSee bug 551450. The wrong zip file ends up being used as the build\nartifact for the documentation plugin when using maven-assembly-plugin.\nUsing maven-antrun plugin instead allows us to workaround the issue\nand have EMF Compare\u0027s doc plugin be signed correctly.\n\nChange-Id: Ib6656920ea2b5fea6be03b338d61a8ad0abebbca\n" }, { "commit": "5235efc9323c45431120dc110cbb24cd0c855a9e", "tree": "ad9a9449fffea331ee6d7d130416dea2b819f6af", "parents": [ "22c53229d480df6fb4dac37ce3ee1ea3474ccaf4" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 10:04:26 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 10:04:26 2019 +0200" }, "message": "Build testing - disable tycho-p2-plugin\n\nChange-Id: I09b909f64f3ae9c31a3e71f69d1e06641a842701\n" }, { "commit": "22c53229d480df6fb4dac37ce3ee1ea3474ccaf4", "tree": "7b521a9be35542a1f1a5ec0881bf578d978222f2", "parents": [ "463d7d7649d208b39700975815a513d1e43a9691" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 09:51:09 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 25 09:51:09 2019 +0200" }, "message": "Build testing - disable eclipse jarsigner\n\nChange-Id: I65873722f4cd630d3e5b1645c259757324560286\n" }, { "commit": "463d7d7649d208b39700975815a513d1e43a9691", "tree": "15e8df650388aa858b227a4736bee94ded3361d3", "parents": [ "b27b068799635648a697bff5e3c0b00a2275bbeb" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 24 17:14:18 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 24 17:14:18 2019 +0200" }, "message": "EMF Compare documentation jar is unsigned\n\nIt looks like the wrong file is taken up by tycho (the website doc\nzip instead of the plugin jar) for the update site.\n\nChange-Id: I6334cd1d67b5e0eb4eb38ffd00e9c0e8d7cb36bc\n" }, { "commit": "b27b068799635648a697bff5e3c0b00a2275bbeb", "tree": "81fb068edc497676ee86e65c165a02b97c05302a", "parents": [ "1e8e5f26ded939c2434cb68d641092d270682c01" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 16:33:05 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 16:33:05 2019 +0200" }, "message": "Replace Guava with Java 8\n\nChange-Id: I6ea95640fae46cbe38645df215424062db13be9b\n" }, { "commit": "1e8e5f26ded939c2434cb68d641092d270682c01", "tree": "2ab0d2dff8c5fd086222282ddbf8bb3ae56b4640", "parents": [ "eebd410a09df9461857f27a090e5f0b77a823d4e" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 13:32:41 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 13:34:59 2019 +0200" }, "message": "Potential race condition when loading EPackages for comparison\n\nBug:551217\nChange-Id: I8e372530b00f1c45751b36a889153980fde7429d\n" }, { "commit": "eebd410a09df9461857f27a090e5f0b77a823d4e", "tree": "2d8713aa0d5c55cc9014cf5c68b7c7f15b6cce87", "parents": [ "5074797c0219b87449b5692a1521d7cfaafb9420" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 13:31:29 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 13:34:53 2019 +0200" }, "message": "Potential NPE with some implementations of the property sheet pages\n\nBug: 551217\nChange-Id: I94ddcc8fd0f42d69b5cece0989a40b6e54fe2dbb\n" }, { "commit": "5074797c0219b87449b5692a1521d7cfaafb9420", "tree": "a9c4836789faf68b705be4d74e5ded733ad720a8", "parents": [ "029f49dd7fd2d30120e778c4d73f973a227ef80a" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 10:43:39 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 10:43:39 2019 +0200" }, "message": "Some implementations of Resource.Diagnostic may return null locations\n\nThis happens with Sirius\u0027 ResourceVersionMismatchDiagnostic at the\ntime of commit.\n\nBug: 551217\nChange-Id: I4c86fc83c7e52cc9d1007269cc7d909fa45e6e15\n" }, { "commit": "029f49dd7fd2d30120e778c4d73f973a227ef80a", "tree": "5ec732b057cba9dd358a81503be289ff72cca3d3", "parents": [ "92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 10:42:35 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 10:42:35 2019 +0200" }, "message": "EMF Compare does not support relative xsi:schemaLocation declarations\n\nBug:551217\nChange-Id: Idd4e6bea34f3f789c6e35f632f8a5e8c0a283a9b\n" }, { "commit": "92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4", "tree": "099a53adef64dff25d87a5769a7d6918fedb6c8b", "parents": [ "f99bc23b43fee4d8fb38f9adeba566effe8ce2ed" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 09:22:22 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 19 09:22:22 2019 +0200" }, "message": "API compatibility\n\ncommit 89b43a837714f3b6315e07dd93a57617a9ce848c broke API\ncompatibility by removing this constructor.\n\nChange-Id: Ibb940c3ca11fef14b6195147921d9b7ba2f3c140\n" }, { "commit": "f99bc23b43fee4d8fb38f9adeba566effe8ce2ed", "tree": "ca2f18f2106693f8dc54294b85c0d0859871508f", "parents": [ "97200ba840304995e83a5b08d0d11e122887947b" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 17:17:08 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 17:17:08 2019 +0200" }, "message": "Remove part of guava uses\n\nChange-Id: Ifb6e5b5bf391d540b3738b501c68221065a21a1b\n" }, { "commit": "97200ba840304995e83a5b08d0d11e122887947b", "tree": "017bc23487e3ba7b4126796246c9ab497907773b", "parents": [ "b2eacd91e102f3749728cd1b82da337f76ba4f0c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 14:10:41 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 14:10:41 2019 +0200" }, "message": "Bump to 3.3.9\n\nChange-Id: I71dcf57ca08878c2a46e8d2f594500a2048c2c2b\n" }, { "commit": "b2eacd91e102f3749728cd1b82da337f76ba4f0c", "tree": "36a807ab499e8e8a827b9a848f9187b9da039931", "parents": [ "2e38e0600c6c5f7149499bc8fa5f397567042a06" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 13:12:45 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 13:12:45 2019 +0200" }, "message": "Open the compare navigatable as internal API\n\nChange-Id: Iea9a2f5d540aa9d350a4a801da80f250bef77cb2\n" }, { "commit": "2e38e0600c6c5f7149499bc8fa5f397567042a06", "tree": "5d3bce6a84997d5ea07dff8f6ec19050f3b814e0", "parents": [ "45ef701770f7dca6e9c0c43d77d5c265afe7eb6c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 09:07:16 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 18 09:07:16 2019 +0200" }, "message": "Register the navigatable so that the toolbar actions work\n\nNavigation actions from the toolbar to go to the next/previous\ndifferences were not working without this.\n\nChange-Id: I3747597c32044868bcbebf524306a1e06f7dd494\n" }, { "commit": "45ef701770f7dca6e9c0c43d77d5c265afe7eb6c", "tree": "33712aa373937e4fcc5874598858df1c58b8438b", "parents": [ "89b43a837714f3b6315e07dd93a57617a9ce848c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 17 15:07:00 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 17 15:07:00 2019 +0200" }, "message": "The navigatable\u0027s cache needs to be cleared when we refresh the viewer\n\nChange-Id: I7e16183de757efce233ae000d7ac4c0f276ac218\n" }, { "commit": "89b43a837714f3b6315e07dd93a57617a9ce848c", "tree": "4e015456046665d8e6b985ace779e0ded52a3334", "parents": [ "b1ea8ab5ab19cca8bc3804bb1c2b4f198db9e70c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 16 14:24:12 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 16 14:24:12 2019 +0200" }, "message": "The MatchEngineFactory doesn\u0027t make use of its setters\n\nChange-Id: Icf5c78c5637cbab24469823970cbe4adaa85fd33\n" }, { "commit": "b1ea8ab5ab19cca8bc3804bb1c2b4f198db9e70c", "tree": "71180a84dc82122cbcc49bbea5bbe0e91b7ffaa5", "parents": [ "74530abb61c39de05a1d0402cc7824f1d0778546" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 16 14:20:23 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 16 14:20:23 2019 +0200" }, "message": "Happy checkstyle\n\nChange-Id: I5b7586a2d5ff8a5f91004fe47e150724a8175812\n" }, { "commit": "74530abb61c39de05a1d0402cc7824f1d0778546", "tree": "8b12be3f5df1c2cc134d6660041a48f572ac6f49", "parents": [ "de44185a23a22debf39cdaa56f56d78f6226bec3" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 11 14:51:00 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 11 14:51:00 2019 +0200" }, "message": "Update setup file\n\nBug: 549478\nChange-Id: I5ce44923b2d904df6d7b6abd616bfb691bbdd024\n" }, { "commit": "de44185a23a22debf39cdaa56f56d78f6226bec3", "tree": "11892e555d2403d37805279b04b71bfa94860682", "parents": [ "96a6bb8fa47c7d27867279103eb411b5cfff27e2" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 09 13:56:41 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 10 14:49:42 2019 +0200" }, "message": "Target platform based on 2019-06\n\nWe need to switch to tycho 1.4.0 to build against such a\nplatform\n\nChange-Id: I8adc6e212801a736c6d293a6b5269b03edc00377\n" }, { "commit": "96a6bb8fa47c7d27867279103eb411b5cfff27e2", "tree": "6492ec215b93a2f3cb6d93751961619ec6811f78", "parents": [ "411886e2e5e83f9a359229214a4ca48c54163dfe" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 10 14:49:15 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Sep 10 14:49:42 2019 +0200" }, "message": "Behavior change in 2019-06 - Exceptions are now in the diagnostic\n\nChange-Id: I83f2abc82fd4beb30d321d501fd864bef5e63c9b\n" }, { "commit": "411886e2e5e83f9a359229214a4ca48c54163dfe", "tree": "f9cf282c896bab45180da46cf9b52df239d5a80c", "parents": [ "4d4d3b32cba5be0fe9a686ee74d1de818de8be80" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 09 15:39:03 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Sep 09 15:39:51 2019 +0200" }, "message": "Remove the 32 bit platforms for our target configurations\n\nChange-Id: I37f41e29d992036012dd64098dfe5a9f88225d3d\n" }, { "commit": "4d4d3b32cba5be0fe9a686ee74d1de818de8be80", "tree": "34c16dafe5ba10c55cf90a345b486b09dd7e640e", "parents": [ "1da5b3a19c2bdd646e7ab710308ab41437c56ba3" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 14:40:36 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:16:03 2019 +0200" }, "message": "Index issue when merging non-unique attributes\u0027 elements\n\nChange-Id: Ic05460d8df2adf2b95d376d651eb03061b50cdad\n" }, { "commit": "1da5b3a19c2bdd646e7ab710308ab41437c56ba3", "tree": "8afb53ab8a0d1e9601c913dd9bc61ab6b41faf06", "parents": [ "e19f31d1091ef35e3e8f5bdc3ce7da239e64cd6e" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 14:38:58 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:16:03 2019 +0200" }, "message": "Diffs depending on pseudo-conflicts do not reject the other side\n\nWhen a diff directly or indirectly requires or implies the merging of\na diff that is part of a pseudo conflict, it should not require the\nrejection of the other side\u0027s diffs since a pseudo conflict is\nsomething that exists in both sides of the comparison.\n\nChange-Id: I97c25caf71b128a7bf302ff48c26859cea10a44b\n" }, { "commit": "e19f31d1091ef35e3e8f5bdc3ce7da239e64cd6e", "tree": "f90d7d1c44bef48a0e67245f2695b2720d9a6bcd", "parents": [ "34cab1322813ebb9c0103552485d50eb536f7c01" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 05 15:29:11 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:16:03 2019 +0200" }, "message": "MOVE differences also need to take into account the FeatureFilter\n\nContainment moves may have (in)significant ordering as well, so we\nneed to check what the FeatureFilter tells us on those\n\nChange-Id: I97f2a5f90db3483f3965a13e4dbc1df2d2ad7453\n" }, { "commit": "34cab1322813ebb9c0103552485d50eb536f7c01", "tree": "fc4591d4b949ee5192ba89c11c0802ed56cefa35", "parents": [ "e3c5741b986295cfdbc106a802d282fd35adce9c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Sep 05 11:03:13 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:16:03 2019 +0200" }, "message": "Inaccurate conflict detection for moves in non-containment features\n\nChange-Id: Iea6f9979d2e4b07b9b34ce594fe653eaaca40594\n" }, { "commit": "e3c5741b986295cfdbc106a802d282fd35adce9c", "tree": "3dace3de39dfeb388f81cb21e2f8bc17dc23c93e", "parents": [ "5d30ac4abac86bc7ad4f9b684c5187ea4bbde8dd" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:15:47 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 17:16:03 2019 +0200" }, "message": "Moves with non-unique values and addition/deletions of duplicates\n\nWe cannot always ignore the \"moved\" values when computing the LCS. ADD\nand DELETE of duplicates of the moved one need to be taken into account.\n\nChange-Id: I5e97b89ae34f9dfd1ef7b9db69c1bf7feb3a5f54\n" }, { "commit": "5d30ac4abac86bc7ad4f9b684c5187ea4bbde8dd", "tree": "1037eea9de6ecf9fb7157a0f983f1e1e48f74193", "parents": [ "a8f8d10ef8d1de13e7ae9df5f0d3e389e3e2da39" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 16:20:58 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Sep 06 16:21:33 2019 +0200" }, "message": "Only MOVE diffs need to be ignored when computing the LCS\n\nChange-Id: Ie85c73f5f69d6fcde26e3023963f3f3fa72a999d\n" }, { "commit": "a8f8d10ef8d1de13e7ae9df5f0d3e389e3e2da39", "tree": "05199d7f7cf3385d8f88547bcd916f1205138c69", "parents": [ "057565817412dd193eac16a0c389be9c5474e727" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 04 16:57:49 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 04 16:57:49 2019 +0200" }, "message": "Conflict detection on index changes must take FeatureFilter into account\n\nChange-Id: I5300af5342fcefb01aeee618a133e30933e9c4d2\n" }, { "commit": "057565817412dd193eac16a0c389be9c5474e727", "tree": "396107d8e6667b4a53aa510058b7d385ff52f13a", "parents": [ "6b7ff72076920b9913bcbb6dceded85830ef25a4" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 04 11:18:59 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Sep 04 11:18:59 2019 +0200" }, "message": "Make sure the UI won\u0027t try to compute the LCS for huge lists\n\nChange-Id: If5c456fb90063919d927edfd9f07012ee5bbb55c\n" }, { "commit": "6b7ff72076920b9913bcbb6dceded85830ef25a4", "tree": "e3aace6f8a29480c301df8e7e961089b8b58669c", "parents": [ "b66be13a918e0a83aae89b6f38fa087672e524ee" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 29 17:26:11 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Aug 30 14:33:13 2019 +0200" }, "message": "The \"accept/reject\" all non-conflicting action shouldn\u0027t touch conflilts\n\nChange-Id: I7977fcf32e86c86f75369563d438bf3f7abdc628\n" }, { "commit": "b66be13a918e0a83aae89b6f38fa087672e524ee", "tree": "ffa59ef23e99b5846d9b688feb6611fbb3ec5cde", "parents": [ "a9a46d1dca11195b5c899f5787df0e3ed58f4b99" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 29 15:25:22 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Fri Aug 30 14:33:13 2019 +0200" }, "message": "Fix diff, conflict detection and merging of non-unique attributes\n\nNon-unique multi-valued attributes had been completely ignored during\nthe conception of EMF Compare and thus every step of the process was\nfailing.\n\nChange-Id: I09c7ff8cf3eee5fff6c76128a3142a29acb15987\n" }, { "commit": "a9a46d1dca11195b5c899f5787df0e3ed58f4b99", "tree": "3b55d6386756eaff673b0a6381385f80653142cf", "parents": [ "d2fcb3b665e8de45a128c17e586f3f936e1e8456" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Aug 28 10:06:56 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Aug 28 10:06:56 2019 +0200" }, "message": "Potential out of bounds exception\n\nEList.move cannot be called with an index equal to the list\u0027s size.\n\nChange-Id: Ia05a7bff2b6312ab07925bdea78145bc27d72214\n" }, { "commit": "d2fcb3b665e8de45a128c17e586f3f936e1e8456", "tree": "d205d360259c52c529b33237e3a5faf41f8ef395", "parents": [ "fc496e5005f08df38b949db5d69a9b05045a44d8" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Aug 27 11:48:48 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Aug 27 13:11:47 2019 +0200" }, "message": "Compatibility with jgit 5.4.2\n\nChange-Id: Ic1fabd9bad94e5ef6634d5fa6176744ec4b1ae7b\n" }, { "commit": "fc496e5005f08df38b949db5d69a9b05045a44d8", "tree": "87e4e2415fe83490714da1d172d3cf67f39a5650", "parents": [ "65237de86258b5a6d8e0179554955d7ef5bc1b1f" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 22 11:50:39 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 22 11:50:39 2019 +0200" }, "message": "Performance - use DiffCrossReferencer when possible\n\nReferences with a large amount of elements (5k or more) with a lot of\ndifferences (1k or more) grind the comparison performances to a halt.\nWhen possible, make use of the DiffCrossReferencer to only iterate\nover the set of relevant differences instead of the whole set of\ndifferences on the current match.\n\nChange-Id: If80ef7cac5e0e573df78ed902a6b49f2fbcc7211\n" }, { "commit": "65237de86258b5a6d8e0179554955d7ef5bc1b1f", "tree": "f5bebbb5a758e609cf01ad46bdc43e3c2fa4a24a", "parents": [ "5b80cc8eb0d75aabd514cc41601368a1b0624a42" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 22 09:55:08 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Aug 22 09:55:08 2019 +0200" }, "message": "regression - right-click actions on single diff selections not shown\n\nChange-Id: Ifc3bacb3e055488c4a4d79d9566b1d61a7d1b6ef\n" }, { "commit": "5b80cc8eb0d75aabd514cc41601368a1b0624a42", "tree": "e727b8c70f9331b507ff70cee6c099be831e5337", "parents": [ "83fced21051cef3680b13e53d1a81701ed68a672" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Aug 06 11:27:04 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Aug 06 11:27:04 2019 +0200" }, "message": "Open SMV API to allow implementers to access the raw list of children\n\nChange-Id: Ifa9eb1ddd4d0f65ed7305966fc4cf28f851ed637\n" }, { "commit": "83fced21051cef3680b13e53d1a81701ed68a672", "tree": "94b686ae9e03742db656af113dfda0afe5b8aa56", "parents": [ "a2a9e4900fec12b998ef71d5ede877398cf77e7c" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 05 17:07:17 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Aug 06 09:55:50 2019 +0200" }, "message": "Prevents exceptions from being thrown from the viewer refresh\n\nAdapterFactoryEditingDomain#isStale(Object) throws one exception per\nitem expanded in the EMF Compare structure merge viewers. For large\nmodels, this can go up to tens of thousands of exception for each\nrefresh, significantly slowing down the merge operations.\n\nThese exceptions are thrown but directly caught and swallowed, so we\ncan circumvent them altogether.\n\nChange-Id: I924364cbd8b9a8727ba8a80e7a40218c4edc2923\n" }, { "commit": "a2a9e4900fec12b998ef71d5ede877398cf77e7c", "tree": "ed00f17918482dbc1d045fef27a6b53c644ff780", "parents": [ "b9371c19bcef120efb86df231f314530bd0e3624" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 05 11:39:06 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 05 14:17:32 2019 +0200" }, "message": "Performance - use streams instead of guava iterations/concatenation\n\nChange-Id: I7164c42ddd79d0a0061ff70ea01899da75bcf429\n" }, { "commit": "b9371c19bcef120efb86df231f314530bd0e3624", "tree": "f573cb4d161e31e13550746ccc0c853cbf6eced9", "parents": [ "d71c0750f068c6c180238f264d142dbf7f83cb2f" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 05 10:20:09 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Mon Aug 05 10:20:09 2019 +0200" }, "message": "Performance - remove useless guava transformation\n\nChange-Id: I2cb63b62ae898628e58ec66a0ae88e01e80c4493\n" }, { "commit": "d71c0750f068c6c180238f264d142dbf7f83cb2f", "tree": "b4c327994e6efac2fecd709d1eb5e1f63dbb6add", "parents": [ "a484b7e7f56a96e49cb8f6beec2d55936088a20a" ], "author": { "name": "Michael Keppler", "email": "michael.keppler@gmx.de", "time": "Tue Jul 23 11:18:52 2019 +0200" }, "committer": { "name": "Michael Keppler", "email": "michael.keppler@gmx.de", "time": "Tue Jul 23 11:18:52 2019 +0200" }, "message": "549477 - NPE in TreeNodeItemProviderSpec.getChildren\n\nAdd a guard condition to handle missing difference group provider more\ngracefully.\n\nBug: 549477\nChange-Id: I8a84dce5c6df8694d79b520fdf43b6e900197492\nSigned-off-by: Michael Keppler \u003cmichael.keppler@gmx.de\u003e" }, { "commit": "a484b7e7f56a96e49cb8f6beec2d55936088a20a", "tree": "0ee4ee28c63c15b82fae948aae315fd6272133c2", "parents": [ "22c21612be43f38771b64e81a328ec215d470864" ], "author": { "name": "Christian W. Damus", "email": "give.a.damus@gmail.com", "time": "Mon Jul 22 12:43:02 2019 -0400" }, "committer": { "name": "Christian W. Damus", "email": "give.a.damus@gmail.com", "time": "Mon Jul 22 12:43:02 2019 -0400" }, "message": "[549463] Save fails when content merge viewer swapped\n\nDon\u0027t redundantly mirror when saving the merge result.\n\nChange-Id: I0b862bf928a6e3266041df0a9c98355ae24f9be8\nSigned-off-by: Christian W. Damus \u003cgive.a.damus@gmail.com\u003e\n" }, { "commit": "22c21612be43f38771b64e81a328ec215d470864", "tree": "a3dbbc478b4252c99af017535a17bedd5617d061", "parents": [ "1998e64ba331e977271a01a57e1e12dbb5a99148" ], "author": { "name": "Christian W. Damus", "email": "give.a.damus@gmail.com", "time": "Mon Sep 11 07:43:59 2017 -0400" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 17 17:03:15 2019 +0200" }, "message": "[522080] [UML] Add-add conflicts in stereotype application not detected\n\nTwo changes in the UML post-processor to handle apply-apply and\nunapply-unapply conflicts for stereotype applications on the same\nelement\nin both sides of the comparison:\n\n* re-match left- and right-side additions/removals of stereotype\napplications\n to match the same stereotype applied to the same element even though\n the XMI IDs are different\n* generate the attribute diffs in added stereotype applications that the\n default diff engine refuses to do, so that we may find conflicts in\ndiffering\n attribute values in the conflict phase (references are handled by the\ncore)\n\nBug: 522080\nChange-Id: I4daac02414abc3f275ac9ff19d6a460b43a0fe84\nSigned-off-by: Christian W. Damus \u003cgive.a.damus@gmail.com\u003e\n" }, { "commit": "1998e64ba331e977271a01a57e1e12dbb5a99148", "tree": "05981c5d7cb1ef0b1a1d01e50d9a7ad079e78726", "parents": [ "c6921d7e119909e179b5920e97739a3666110b07" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 17 10:51:07 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 17 11:28:03 2019 +0200" }, "message": "Fix detection of pseudo conflicts on single-valued attribute changes\n\nPseudo-conflicts on single-valued attribute changes was populated with\nthe origin as the changed value even if the left/right side was\nnon-null.\n\nChange-Id: Id225da76bb381a476715c9af9581cd0bc2b9e47a\n" }, { "commit": "c6921d7e119909e179b5920e97739a3666110b07", "tree": "c0ae63b0c2ca9c8e17e9d987dc543d1187a93a41", "parents": [ "42be4e873ad5afc43bcf124d49a30a4bbb9152d0" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 16:50:21 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 16:58:46 2019 +0200" }, "message": "Regression on the group/match right-click actions in SMW\n\nCommit df841999 allowed \"accept\" and \"reject\" actions to be shown on\nmultiple differences selections... but at the same time prevented all\nother actions from showing in the SMV.\n\nChange-Id: I9ec9b2e4e216a8985dd5ee7eb9d11aa22d1f09ab\n" }, { "commit": "42be4e873ad5afc43bcf124d49a30a4bbb9152d0", "tree": "502cc6b3a1fa7290b4373ca322b5b8618e45e6a0", "parents": [ "42f0b44af4e8d8b4a953234913d514a03c4225bb" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 16:48:52 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 16:58:33 2019 +0200" }, "message": "Properly describe what the conflict resolving actions will do.\n\nChange-Id: I31b1c4d777c8a84d3c782e4e4eae700116babccf\n" }, { "commit": "42f0b44af4e8d8b4a953234913d514a03c4225bb", "tree": "71dc9dea79e3d997bdff0b7694d40227366c7c9f", "parents": [ "621b4e5d9b7b73cd31d6d4c32b0ce86f4e4b7dd8" ], "author": { "name": "Martin Fleck", "email": "mfleck@eclipsesource.com", "time": "Wed Dec 07 17:18:51 2016 +0100" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 14:52:37 2019 +0200" }, "message": "[506928] ComparisonScopeEditorInput does not respect configuration\n\nInitialize comparison input with comparison configuration.\nIncludes tests.\n\nBug: 506928\nChange-Id: I39c07e0093211170a81aba07fe082d0aafc74afa\nAlso-by: Tobias Ortmayr \u003ctobias.ortmayr@gmail.com\u003e\nSigned-off-by: Martin Fleck \u003cmfleck@eclipsesource.com\u003e\n" }, { "commit": "621b4e5d9b7b73cd31d6d4c32b0ce86f4e4b7dd8", "tree": "9abf121cdcdb0b3e0409d1a24676d67a83bdffac", "parents": [ "20f1631e641c8fbd8bf80ff3c2fd24cd0b02159d" ], "author": { "name": "Stefan Dirix", "email": "sdirix@eclipsesource.com", "time": "Tue Mar 21 12:06:52 2017 +0100" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 08:26:08 2019 -0400" }, "message": "Cancel Faster in ProximityEObjectMatcher\n\nWhen the given Monitor indicates \u0027Cancel\u0027 the ProxmityEObjectMatcher\nwill return faster.\n\nSigned-off-by: Stefan Dirix \u003csdirix@eclipsesource.com\u003e\nChange-Id: Ie767d059be1ab6f1f4d5979098d0d237b3476cc8\n" }, { "commit": "20f1631e641c8fbd8bf80ff3c2fd24cd0b02159d", "tree": "62ab1f08fb6ea4c9fb19f7b4a729ed1428beb16c", "parents": [ "5f7487d505d34caf5b891c96ea6f8a292088d3bb" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 14:19:46 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 14:19:46 2019 +0200" }, "message": "Add StructureMergeViewer customization options\n\nImproves support for Subclasses of EMFCompareStructureMergeViewer by\nchanging access modifiers and adding Getters for some private variables.\n\nAlthough the code is not intended to be subclassed there exist\nsubclasses with small modifications in the wild. This commit allows\nthose subclasses to access a little more of the internal mechanism of\nthe EMFCompareStructureMergeViewer.\n\nSigned-off-by: Stefan Dirix \u003csdirix@eclipsesource.com\u003e\nChange-Id: I7d96b189dd6624a90925d674606a56481681f528" }, { "commit": "5f7487d505d34caf5b891c96ea6f8a292088d3bb", "tree": "f6d58eb238d1f688f89c0ac255485bc6830115a4", "parents": [ "031f219e54bcf398f4723da65f7106be6fa1d127" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 11:59:24 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 11:59:24 2019 +0200" }, "message": "Shortcut the UMLPostProcessor\u0027s subset implications when possible\n\nChange-Id: If34c91faa268518d989b5e6a2c0717f61f82aad6\nSigned-off-by: Martin Fleck \u003cmfleck@eclipsesource.com\u003e" }, { "commit": "031f219e54bcf398f4723da65f7106be6fa1d127", "tree": "493eb6c86bb350188e708008c7c788dff39bc40a", "parents": [ "31eb9369acf3da7f6548fdc5298b678d24f38b5d" ], "author": { "name": "Axel Richard", "email": "axel.richard@obeo.fr", "time": "Mon Sep 21 16:33:52 2015 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 11:43:08 2019 +0200" }, "message": "Activation of all Git tests\n\nThis removes the StrategyRecursiveModelTests since they can no longer\nwork after we locked the target models to the single EMFModelProvider\n(see LogicalModels.getEMFModelProvider()).\n\nChange-Id: I200b614a1c64b9a4cd9600a43f3d0473d5108e69\nAlso-by: Axel Richard \u003caxel.richard@obeo.fr\u003e\nSigned-off-by: Mathieu Cartaud \u003cmathieu.cartaud@obeo.fr\u003e\n" }, { "commit": "31eb9369acf3da7f6548fdc5298b678d24f38b5d", "tree": "0fc273579acae95cc3e5e48aed952a8e9f47167c", "parents": [ "0d19349ed46204108bad9c31d002f979699ca586" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 09:55:38 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 09:55:38 2019 +0200" }, "message": "Prevent NPE from overriden Resource implementations\n\nSome resource implementations fail to consider \"null\" input as the\noptions map for \"doSave\" and end up in NullPointerExceptions.\n\nChange-Id: Ie38dff790ac4ed7b1763fc5a8290f610216add8e\n" }, { "commit": "0d19349ed46204108bad9c31d002f979699ca586", "tree": "bd86e585fa54ef2e4d7fd073d96b94e23f2625c5", "parents": [ "42ef2261114162539075513b53bd27634c1286c4" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 09:53:58 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Tue Jul 16 09:53:58 2019 +0200" }, "message": "Ignore \"originalTargetObjects\" from the EMF Compare change recorder\n\nThis is the same performance workaround that has been used by EMF\nTransaction in the TransactionChangeRecorder. Each individual \"accept\"\nor \"reject\" of a difference will trigger the \"consolidateChanges\" call\non the ChangeRecorder. As the size of the \"originalTargetObjects\" list\ndepends on the size of the compared models, creating a copy of this\nlist every time we merge is a huge performance sink.\n\nChange-Id: Ie597fdbd0d2734963a152c0fdf3099457b1668ef\n" }, { "commit": "42ef2261114162539075513b53bd27634c1286c4", "tree": "43f0abbae2a09a3ea226e7204919b95b0d934167", "parents": [ "df841999a6012a78cfcf85b3646ecdfe8949aec5" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 10 11:18:13 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed Jul 10 11:18:13 2019 +0200" }, "message": "Bump versions to 3.3.8\n\nChange-Id: I1fdea8b2deb42916ee25689914386fc9b4880bbd\n" }, { "commit": "df841999a6012a78cfcf85b3646ecdfe8949aec5", "tree": "2579a3b32922c201d72d2a28c2cfe88080af10ae", "parents": [ "08799582e7174a33f8e58d07e48649f5b388af90" ], "author": { "name": "William Piers", "email": "william.piers@obeo.fr", "time": "Thu Jul 04 10:45:50 2019 +0200" }, "committer": { "name": "Laurent Goubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Jul 04 09:15:38 2019 -0400" }, "message": "Enabled \"accept change\" action on multiple diff selection\n\nChange-Id: I46c603dcac9fde2c336b21f696c9bc1ca80af338\nSigned-off-by: William Piers \u003cwilliam.piers@obeo.fr\u003e\n" }, { "commit": "08799582e7174a33f8e58d07e48649f5b388af90", "tree": "a4b163bd4625072ff7f41641e81b541d9efa98c9", "parents": [ "23df29bcb7866598f4e249e3da98a52142f62d9b" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Jul 04 14:42:59 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Thu Jul 04 14:56:01 2019 +0200" }, "message": "Adapt tests to EGit change of behavior\n\nChange-Id: I0929fdbc28904bdc59c594b1f0935b4ec580ddab\n" }, { "commit": "23df29bcb7866598f4e249e3da98a52142f62d9b", "tree": "285a3cb1b505eef9d58e98354140e41e8e53a150", "parents": [ "7f0ed79430efeb4e0755a5ebdf0f91b013d2b170" ], "author": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed May 29 09:58:32 2019 +0200" }, "committer": { "name": "lgoubet", "email": "laurent.goubet@obeo.fr", "time": "Wed May 29 09:58:32 2019 +0200" }, "message": "Enable users to merge all conflicts at once through right-click action\n\nChange-Id: I77b5f6715aa87d2dae9d1adf73a20e502b90e1a8\n" } ], "next": "7f0ed79430efeb4e0755a5ebdf0f91b013d2b170" }