Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. Switch to 2021-06 tp and latest EGit version (details)
  2. Prevent NPE from the title builder job if run during/after disposal (details)
  3. Fix delete-change conflict detection (at file level) (details)
  4. Add script to publish releases for JIRO (details)
  5. fix release publication script (details)
  6. Fix release script (details)
Commit 2fec5a7e3f8e5474de1a49ccbd32c3ffbdc42421 by Laurent Goubet
Switch to 2021-06 tp and latest EGit version

Change-Id: Id37e22c45b68e80c516ca4d3b9c4d48b80ada113
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitSyncInfoToDiffConverter.java
The file was modified plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/actions/ModelMergeToolActionHandler.java
The file was modified plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/DirCacheResourceVariantTreeProvider.java
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2021-06-extras-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/TreeWalkResourceVariantTreeProvider.java
The file was modified packaging/org.eclipse.emf.compare.gendoc/lib/jar-in-jar-loader.zip
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2021-06-sdk.target
The file was modified org.eclipse.emf.compare-parent/pom.xml
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2021-06-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/AbstractGitOperationStatement.java
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2021-06-extras-sdk.target
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/InternalGitTestSupport.java
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitResourceVariantTreeProvider.java
Commit a8ce42be598ac6b8cc4c4e4d20411c680cbd025a by Laurent Goubet
Prevent NPE from the title builder job if run during/after disposal

Change-Id: Ia059bcfb8ae2d21fd3a096cf0b70226394013788
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
Commit 384248566a4dff04966a1e736564d2d871712941 by Laurent Goubet
Fix delete-change conflict detection (at file level)

Removing a file locally and changing it remotely should be seen as a
conflict by EMF Compare, but since we were using the local traversal
(empty since the file has been removed) as starting point, we were not
able to resolve the remote files either, ending up in an empty
comparison because of missing file variants.

Change-Id: I279ea3cd3b30fa65cc5a244917685e76d42e0f81
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java
Commit 434b42bfb42123875c840263f6ca89ca732e2b9f by Laurent Goubet
Add script to publish releases for JIRO

Change-Id: I67d83d03f73234775200dd9f5ff93a9153ac9b60
The file was addedreleng/org.eclipse.emf.compare.releng/publish-release.sh
Commit 2f5b968816d2d8dcc82762f1d82cd8f0a5ff3958 by Laurent Goubet
fix release publication script

Change-Id: I8a8b6358981b0bd6a2c4e64d3b34eb909896b622
The file was modified releng/org.eclipse.emf.compare.releng/publish-release.sh
Commit ee57472debac0944840b4b521194608c4f3f0e72 by Laurent Goubet
Fix release script

Change-Id: If38ee0068df2b4bd9b8fb3c4167bc12d0c5b6cba
The file was modified releng/org.eclipse.emf.compare.releng/publish-release.sh