Google Git
Sign in
eclipse / gerrit / emfcompare / org.eclipse.emf.compare / HEAD
  1. e08da95 change visibility of the resolution context by lgoubet · 4 years, 5 months ago master
  2. 9514c6b Bump version to 3.3.15 by lgoubet · 4 years, 5 months ago
  3. b0f39da Enable diagram post processor for GMF 1.10 and above by lgoubet · 4 years, 5 months ago
  4. ee57472 Fix release script by lgoubet · 4 years, 5 months ago
  5. 2f5b968 fix release publication script by lgoubet · 4 years, 5 months ago
  6. 434b42b Add script to publish releases for JIRO by lgoubet · 4 years, 5 months ago
  7. 3842485 Fix delete-change conflict detection (at file level) by lgoubet · 4 years, 5 months ago
  8. a8ce42b Prevent NPE from the title builder job if run during/after disposal by lgoubet · 4 years, 8 months ago
  9. 2fec5a7 Switch to 2021-06 tp and latest EGit version by lgoubet · 4 years, 5 months ago
  10. 635eb1f Use Unix line delimiters for shell scripts by lgoubet · 4 years, 10 months ago
  11. 515be82 Add script to publish milestones for JIRO by lgoubet · 4 years, 10 months ago
  12. 4fed9d2 Add nightly publication script for JIRO by lgoubet · 4 years, 10 months ago
  13. 0715cae Open ranges to accept Guava 30.1 by lgoubet · 4 years, 10 months ago
  14. 28b6218 Bump version to 3.3.14 by lgoubet · 4 years, 10 months ago 3.3.14RC1
  15. 85eb79c Do not close the repository when creating the EMF merge tool by lgoubet · 4 years, 10 months ago
  16. b94c828 [570625] Provide overridable isTransient(EStructuralFeature) method in FeatureFilter by Eike Stepper · 5 years ago
  17. d26772c Fix potential NPE by Axel RICHARD · 5 years ago
  18. 97068e5 Potential NPE by lgoubet · 5 years ago
  19. cc190c9 Make sure folders are created when extracting input files by lgoubet · 5 years ago 3.3.13 3.3.13RC2
  20. 31fab8d Bump versions to 3.3.13 by lgoubet · 5 years ago 3.3.13RC1
  21. 6b1e4f7 Do not close the repository, getRepositoryCache().clear() will do it by lgoubet · 5 years ago
  22. e523511 Allow loading of models using ID attributes for comparison by lgoubet · 5 years ago
  23. 047cab3 Compatibility recent mockito by lgoubet · 5 years ago
  24. 92126df Only consider files we've extracted as potential test projects by lgoubet · 5 years ago
  25. 25ae361 Delete sub-projects first when cleaning up test workspace by lgoubet · 5 years ago 3.3.12 3.3.12RC1
  26. 6926c74 Bump Versions to 3.3.12 by lgoubet · 5 years ago 3.3.12M1
  27. a6412a1 Fix name of 2019-12 target platform by lgoubet · 5 years ago
  28. 8314994 [564680] Improved diagram display. by Glenn Plouhinec · 6 years ago
  29. 4b376fa [564658] New Feature : Export Diagram Comparison as images. by Glenn Plouhinec · 6 years ago
  30. 991266d Fix GitTestSupport by lgoubet · 5 years ago
  31. f6a63ee Update orbit.tpd to resolve new EGit requirement to org.assertj dependency. by Glenn Plouhinec · 5 years ago
  32. 312374e Bump versions to 3.3.11 by lgoubet · 6 years ago 3.3.11 3.3.11M1
  33. 9c103fd [562321] Improved Undo/Redo actions by Glenn Plouhinec · 6 years ago
  34. 99bed8d [561825] Merge a Sirius Node doesn't merge "actualMapping" difference. by Glenn Plouhinec · 6 years ago
  35. ae3c311 Git test framework failing on windows by lgoubet · 6 years ago
  36. 4b76fb3 Merge a deleted Sirius node from right to left throws a WrappedException by Glenn Plouhinec · 6 years ago
  37. 797551c [560861] Swapping content merge viewer don't swap phantoms by Glenn Plouhinec · 6 years ago
  38. 258af38 [doc] update User Guide: Change download page link. by Glenn Plouhinec · 6 years ago 3.3.10 3.3.10RC1
  39. baa974a Bump update sites to 3.3.10 by lgoubet · 6 years ago 3.3.10M1
  40. 4ed9fe8 Bump EMF Compare to 3.3.10 and add 2019-12 target platform by lgoubet · 6 years ago
  41. 8f8e4c4 Prevent NPE from the closing of a Comparison Dialog by lgoubet · 6 years ago
  42. ec64f3c Compatibility with JGit 5.6.0 by lgoubet · 6 years ago
  43. d0cdd0e Potential NPE when switching files in the compare dialog by lgoubet · 6 years ago 3.3.9 3.3.9M3
  44. 8086353 Switch EMF Compare to Guava 27 by lgoubet · 6 years ago
  45. 51941ba Re-enable signing and tycho-p2-plugin, switch website to antrun by lgoubet · 6 years ago 3.3.9M2
  46. 5235efc Build testing - disable tycho-p2-plugin by lgoubet · 6 years ago
  47. 22c5322 Build testing - disable eclipse jarsigner by lgoubet · 6 years ago
  48. 463d7d7 EMF Compare documentation jar is unsigned by lgoubet · 6 years ago
  49. b27b068 Replace Guava with Java 8 by lgoubet · 6 years ago 3.3.9M1
  50. 1e8e5f2 Potential race condition when loading EPackages for comparison by lgoubet · 6 years ago
  51. eebd410 Potential NPE with some implementations of the property sheet pages by lgoubet · 6 years ago
  52. 5074797 Some implementations of Resource.Diagnostic may return null locations by lgoubet · 6 years ago
  53. 029f49d EMF Compare does not support relative xsi:schemaLocation declarations by lgoubet · 6 years ago
  54. 92fc0d1 API compatibility by lgoubet · 6 years ago
  55. f99bc23 Remove part of guava uses by lgoubet · 6 years ago
  56. 97200ba Bump to 3.3.9 by lgoubet · 6 years ago
  57. b2eacd9 Open the compare navigatable as internal API by lgoubet · 6 years ago
  58. 2e38e06 Register the navigatable so that the toolbar actions work by lgoubet · 6 years ago
  59. 45ef701 The navigatable's cache needs to be cleared when we refresh the viewer by lgoubet · 6 years ago
  60. 89b43a8 The MatchEngineFactory doesn't make use of its setters by lgoubet · 6 years ago
  61. b1ea8ab Happy checkstyle by lgoubet · 6 years ago
  62. 74530ab Update setup file by lgoubet · 6 years ago
  63. de44185 Target platform based on 2019-06 by lgoubet · 6 years ago 3.3.8 3.3.8RC1
  64. 96a6bb8 Behavior change in 2019-06 - Exceptions are now in the diagnostic by lgoubet · 6 years ago
  65. 411886e Remove the 32 bit platforms for our target configurations by lgoubet · 6 years ago
  66. 4d4d3b3 Index issue when merging non-unique attributes' elements by lgoubet · 6 years ago 3.3.8M7
  67. 1da5b3a Diffs depending on pseudo-conflicts do not reject the other side by lgoubet · 6 years ago
  68. e19f31d MOVE differences also need to take into account the FeatureFilter by lgoubet · 6 years ago
  69. 34cab13 Inaccurate conflict detection for moves in non-containment features by lgoubet · 6 years ago
  70. e3c5741 Moves with non-unique values and addition/deletions of duplicates by lgoubet · 6 years ago
  71. 5d30ac4 Only MOVE diffs need to be ignored when computing the LCS by lgoubet · 6 years ago
  72. a8f8d10 Conflict detection on index changes must take FeatureFilter into account by lgoubet · 6 years ago
  73. 0575658 Make sure the UI won't try to compute the LCS for huge lists by lgoubet · 6 years ago
  74. 6b7ff72 The "accept/reject" all non-conflicting action shouldn't touch conflilts by lgoubet · 6 years ago 3.3.8M6
  75. b66be13 Fix diff, conflict detection and merging of non-unique attributes by lgoubet · 6 years ago
  76. a9a46d1 Potential out of bounds exception by lgoubet · 6 years ago
  77. d2fcb3b Compatibility with jgit 5.4.2 by lgoubet · 6 years ago 3.3.8M5
  78. fc496e5 Performance - use DiffCrossReferencer when possible by lgoubet · 6 years ago
  79. 65237de regression - right-click actions on single diff selections not shown by lgoubet · 6 years ago
  80. 5b80cc8 Open SMV API to allow implementers to access the raw list of children by lgoubet · 6 years ago 3.3.8M4
  81. 83fced2 Prevents exceptions from being thrown from the viewer refresh by lgoubet · 6 years ago
  82. a2a9e49 Performance - use streams instead of guava iterations/concatenation by lgoubet · 6 years ago
  83. b9371c1 Performance - remove useless guava transformation by lgoubet · 6 years ago
  84. d71c075 549477 - NPE in TreeNodeItemProviderSpec.getChildren by Michael Keppler · 6 years ago 3.3.8M3
  85. a484b7e [549463] Save fails when content merge viewer swapped by Christian W. Damus · 6 years ago
  86. 22c2161 [522080] [UML] Add-add conflicts in stereotype application not detected by Christian W. Damus · 8 years ago
  87. 1998e64 Fix detection of pseudo conflicts on single-valued attribute changes by lgoubet · 6 years ago
  88. c6921d7 Regression on the group/match right-click actions in SMW by lgoubet · 6 years ago
  89. 42be4e8 Properly describe what the conflict resolving actions will do. by lgoubet · 6 years ago
  90. 42f0b44 [506928] ComparisonScopeEditorInput does not respect configuration by Martin Fleck · 9 years ago 3.3.8M2
  91. 621b4e5 Cancel Faster in ProximityEObjectMatcher by Stefan Dirix · 9 years ago
  92. 20f1631 Add StructureMergeViewer customization options by lgoubet · 6 years ago
  93. 5f7487d Shortcut the UMLPostProcessor's subset implications when possible by lgoubet · 6 years ago
  94. 031f219 Activation of all Git tests by Axel Richard · 10 years ago
  95. 31eb936 Prevent NPE from overriden Resource implementations by lgoubet · 6 years ago
  96. 0d19349 Ignore "originalTargetObjects" from the EMF Compare change recorder by lgoubet · 6 years ago
  97. 42ef226 Bump versions to 3.3.8 by lgoubet · 6 years ago 3.3.8M1
  98. df84199 Enabled "accept change" action on multiple diff selection by William Piers · 6 years ago
  99. 0879958 Adapt tests to EGit change of behavior by lgoubet · 6 years ago
  100. 23df29b Enable users to merge all conflicts at once through right-click action by lgoubet · 7 years ago 3.3.7 3.3.7RC1