)]}' { "commit": "e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e", "tree": "82277280e364cdf5920ceed406b973605b3e3467", "parents": [ "68a39767bef4abb768055e6fc0b33618438fb620" ], "author": { "name": "Axel Richard", "email": "axel.richard@obeo.fr", "time": "Tue May 21 17:55:05 2013 +0200" }, "committer": { "name": "Mikaël Barbero", "email": "mikael.barbero@obeo.fr", "time": "Thu Jun 27 22:18:44 2013 +0200" }, "message": "[398361] Enhanced Model Merge UI\n\n- Add new Ruler next to StructureMergeViewer\n- When select diff in StructureMergeViewer, highlight required and\nunmergeable diffs,\nand create annotations in Ruler\n- Add new merge and navigation actions in StructureMergeViewer toolbar.\n- Delete old merge and navigation actions in ContentMergeViewer toolbar.\n\nBug: 398361\nChange-Id: I3d43fe9c4938404361f835e93631ed744a2c4377\n\n", "tree_diff": [ { "type": "modify", "old_id": "90a86939ccd4b21b78b6dd7f8a002ab80ae752dc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java", "new_id": "8b5f08da83760caeff771bab6fe814645c073d32", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "117e63d56bf7f682caa1e230ef82340218aa5c92", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.edit/icons/full/ovr16/merged_left_ov.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "26ebe0fe6b9cef38001f77cbc2386da5d7e5ac91", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.edit/icons/full/ovr16/merged_right_ov.gif" }, { "type": "modify", "old_id": "36593291126f1fbba91bc0dc07d35520f617fd57", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java", "new_id": "a73652b165b40cb8aa1fe56f64a7cf6e9ecb7b19", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "8456759aaecfde1117258eb4c41c095f3f978bbc", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/accept_all_changes.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "23c97f09e677bb8812b26d4415fd97997e5c95a4", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/accept_change.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "29189bbab9ccae4b1eb46324d90438ffcf6a2b01", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/left_to_right.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e029948cf811de2c43edc5b800dbe66856974711", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_all_to_left.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "0659813a13dee7ac395bbd740927014c5bd30fb1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_all_to_right.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "db2b1e3d5efa27bb1a4592daba09b9334eb0f224", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_to_left.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "9ebd50a9fddab61a2d4ce821a8ea4a3367472619", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_to_right.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "79cda1359b9f383822e19f7c0dbcf6e69ba87cac", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/next_diff.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d5a96ec9721f5e664899bce884e187c39780d2bb", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/prev_diff.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "a873b30560567bc9a4daabbf1ccda04dc7f79921", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/reject_all_changes.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "1aca259db3187590fefc94c816bca144ef3d5d3e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/reject_change.gif" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "ce33df2a23c6886d584e60f07e5af521a8ba77bd", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/right_to_left.gif" }, { "type": "modify", "old_id": "c87ce892d439aea4be4e2fdd8c4cfc9283ea89c4", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/plugin.properties", "new_id": "a9c88e240b8e1c5b7a42a94ca88c3ab01d37fd11", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/plugin.properties" }, { "type": "modify", "old_id": "ddc8431ab250475173ec9a87df02ca45af5eeeac", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/plugin.xml", "new_id": "124535c5eecbc01314220677ce366f9fb4cc0ab1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/plugin.xml" }, { "type": "modify", "old_id": "03c80982f478d27376af1e022b3b29b30d694e72", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java", "new_id": "c3df55225174cdd185b81a36b50bf2930f470342", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java" }, { "type": "modify", "old_id": "ea3ba9847d9ef94b5fe766482e30d3517b67ac60", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/expand/ExpandAllModelAction.java", "new_id": "a36941860131fd5047d56f2205de1309309a5ea3", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/expand/ExpandAllModelAction.java" }, { "type": "modify", "old_id": "28deda794de618bef7b83f77bea9e3f410e734ab", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java", "new_id": "0ab47750e4cb3764a901619962526fffe88007f5", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java" }, { "type": "modify", "old_id": "68a7c512af63886ace5d4182cb15df3230e55284", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java", "new_id": "45ef92e5749b61a94e1ca0c19ab6dd3cf6b658fe", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java" }, { "type": "modify", "old_id": "d3f6cd7928169869cfc61200a94f70fee2525257", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java", "new_id": "db0483d601338159060a3f7498a6ca067dc7d344", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "41b62f00b12a7dd2758d7eb2d0cfe91dd190aa5f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractViewerWrapper.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7cefbdb9186893ecf63ddd16d088435afd54ef83", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareDiffTreeRuler.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "d5171601d4dc6e96fe72be567577c4e3eed218ec", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareDiffTreeViewer.java" }, { "type": "modify", "old_id": "4895d4911d2e321c29365dee8a5d682d620f468e", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java", "new_id": "a9968c40ee51c27eb6fd326ca5581a4896e4d464", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java" }, { "type": "modify", "old_id": "492208bce51e5721e06645129c8cc06221be6e71", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java", "new_id": "901488d5b7323d4e5b0a01907c49674e2945e74d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java" }, { "type": "modify", "old_id": "b9b13a0de256c1de3f37aff1ebd8c25a764d8058", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java", "new_id": "9c8b99dfa37686a6f5fbdde1ed6072d3e1e84c18", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "6ad6ac943019462810200b8d06b8e9b9c8d838f5", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractAcceptRejectAllChanges.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "317da68e6ebd2d321bd8f13d96bf3118d7f7f2bf", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractAcceptRejectChange.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "0cc28123a499eafc11e5ad2143fdb1da96b89b36", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractMergedAllTo.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "ddb0173402bdf622d5c44a2e56b973ddffd7ebf9", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractMergedTo.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "2929d5702409aa0b531feae5d098aa4aa8b4eb9a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AcceptAllChanges.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "89967207afc9ae6fc28a1fd1e7ee755725f82464", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AcceptChange.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "3d94941061f2fe6afe3462a34430ab43f233e7b6", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownHandler.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "beeca1c86d718789c2ff347a1c0ac1831a4465b0", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownLeftToRight.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "3daff914f497a7704143826f3e7f4bccf46bc384", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownRightToLeft.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "543f4c94576b670576c4c64b64f49e16d2927982", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedAllToLeft.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "eab8d32f01a6b0c037896e5bcfcce602d37d9bf1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedAllToRight.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "dde61ec926c4cfd2569fd5d69e3adc7dcf813897", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedToLeft.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5e754f3860cbe57a9fd68203c53d919a90f337b7", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedToRight.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "1e9cd62a9d2e8b7cb72f7fd476104b0ac989b4d6", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/RejectAllChanges.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "996a129bdd316a88639c959f4408a8c8f390482a", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/RejectChange.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "e2e6bb16301cb019dbdb587fedd4acd473b1e3e1", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SelectNextDiff.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "5ecd4e10d1fe3d5efffc86ebf0a526cc3d8e2fc4", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SelectPreviousDiff.java" }, { "type": "copy", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "a79978c13c5c2e81f3c525a6356a7c3bafad829d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/AcceptRejectChangePropertyTester.java", "score": 73 }, { "type": "copy", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "ebad5be651ee440885ac1dfb53c0c090b82d0964", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java", "score": 61 }, { "type": "copy", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "780860517248f422a931df2bc3fd1ecfe8836a33", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/LeftToRightSidePropertyTester.java", "score": 77 }, { "type": "copy", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "75447c35fdcbacce8b8569bdeeeb72b009d0c489", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/MergedToPropertyTester.java", "score": 78 }, { "type": "rename", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "ea6890f041f051d9c13fb84a7339c870571ab406", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/ModelSaveablePropertyTester.java", "score": 88 }, { "type": "copy", "old_id": "3b409db57d44968f6ac5e25fc8c128a01fbeabdc", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java", "new_id": "92310abc71b5c57c6ba31828b5d5120e40dbe93f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/RightToLeftSidePropertyTester.java", "score": 77 }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "59e1b6bb90135b4da760be6ee11c63ca8beff771", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/util/EMFCompareUIHandlerUtil.java" }, { "type": "modify", "old_id": "aa7c8f985747f618b7cfe2c0d460057b32f4d039", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/EMFCompareConstants.java", "new_id": "4d1b073928ca4b4f28c6a233eea8f8c20b70afd3", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/EMFCompareConstants.java" }, { "type": "modify", "old_id": "e2ed6a97e0b19d55832d9a3e4f5d402f7c1175d3", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java", "new_id": "29970dfa2ab08b655d03dfbdd30568bbcfc2326f", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java" }, { "type": "modify", "old_id": "6f1c8b284508a775789090bfd859034ec7c95436", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF", "new_id": "10caf73a847c4ada4d5254bcd38c4a360ce50e13", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "513e76b47929cd377074aa6e97ed5cea22f5af8e", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/DiffMergeDataAdapter.java" }, { "type": "add", "old_id": "0000000000000000000000000000000000000000", "old_mode": 0, "old_path": "/dev/null", "new_id": "7531b546d87e51c4d4c208fec9896a3c6dcddd9d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IDiffMergeData.java" }, { "type": "modify", "old_id": "dfa567f9aae58801aeec4ae208e2af7551c0cef9", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java", "new_id": "8dedf68c9a5c583535431d0072ac9a7037b5882d", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java" }, { "type": "modify", "old_id": "8d852314cb4885d12a9bc284a8d4c506ffb8ee5b", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java", "new_id": "93460f792e9fd1ccfdb312533c766427037da4a9", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java" }, { "type": "modify", "old_id": "f77eef08e62f4280da9897ac62d561b3070a6e1d", "old_mode": 33188, "old_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java", "new_id": "ce9d162b408d8da02a411847b2c69eba797aada4", "new_mode": 33188, "new_path": "plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java" } ] }