[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[emfcompare-build] Build failed in Jenkins: master-build-on-egit-logical-nighlty » oxygen-extras,jdk1.8.0-latest #638
|
See <https://ci.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/PLATFORM=oxygen-extras,jdk=jdk1.8.0-latest/638/display/redirect?page=changes>
Changes:
[laurent.goubet] Don't return null from ITypedElement.getName().
[laurent.goubet] Memory leak during automatic merge operations from EGit
[laurent.goubet] XMI files are not always models
[laurent.goubet] Removing the subversive integration plugins
[laurent.goubet] Memory leaks when comparing Sirius diagrams
[laurent.goubet] Memory leak from the EMFModelProvider.contextToResourceMappingCache
[laurent.goubet] No changes shown when there is an added Sirius diagram
[laurent.goubet] [521886] Avoid validation in EMFCompareEditingDomain
------------------------------------------
[...truncated 8.34 KB...]
+ git cherry-pick FETCH_HEAD
[detached HEAD cbdfbbe] [516248] Improve Navigatable caching
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 85 insertions(+), 63 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 12'
>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 12
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/105075/12
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/105075/12 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2de5f12] [521948] Support changing the state of diffs already in terminal state
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
12 files changed, 1214 insertions(+), 164 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/CommandStackEvent.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105221 patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/105221 patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/21/105221/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/21/105221/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 58bac47] [522372] Introduce timeout for auto expansion and expand all behavior
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 257 insertions(+), 13 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105303 patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/105303 patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/03/105303/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/03/105303/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 24f5521] [522422] Label-based content viewer should clean up the toolbar
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 8 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105322 patch-set 13'
>> Cherry-picking https://git.eclipse.org/r/#/c/105322 patch-set 13
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/22/105322/13
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/22/105322/13 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 3c62bbb] [514079] Improve mirroring support
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
42 files changed, 1385 insertions(+), 1334 deletions(-)
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorUtil.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/MirroredTableContentMergeViewerContentProvider.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/MirroredEMFCompareTextMergeViewerContentProvider.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/MirroredTreeContentMergeViewerContentProvider.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111523 patch-set 8'
>> Cherry-picking https://git.eclipse.org/r/#/c/111523 patch-set 8
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/23/111523/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/23/111523/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD be95064] Support key bindings for commonly used merge/navigate actions
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
3 files changed, 204 insertions(+), 47 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111526 patch-set 8'
>> Cherry-picking https://git.eclipse.org/r/#/c/111526 patch-set 8
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/26/111526/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/26/111526/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 72e26cd] EMFCompareStructureMergeViewer does much redundant work changing input
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 98 insertions(+), 48 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111630 patch-set 8'
>> Cherry-picking https://git.eclipse.org/r/#/c/111630 patch-set 8
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/30/111630/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/30/111630/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2c946ed] The show merge consequences control is confusing when disabled
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
7 files changed, 131 insertions(+), 60 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/disabled_highlight_related_changes.gif
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111990 patch-set 9'
>> Cherry-picking https://git.eclipse.org/r/#/c/111990 patch-set 9
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/90/111990/9
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/90/111990/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9d12ef0] [508526] Improve text compare
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
7 files changed, 1708 insertions(+), 247 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/show_preview.gif
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112072 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/112072 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/72/112072/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/72/112072/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD b8787b0] [527567] DiagramCompareItemProviderAdapterFactory should be a decorator
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
4 files changed, 163 insertions(+), 120 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/matchs/provider/spec/BaseItemProviderDecorator.java
rewrite plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/matchs/provider/spec/DiagramCompareItemProviderAdapterFactorySpec.java (61%)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112073 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/112073 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/73/112073/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/73/112073/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 427eb33] [527567] Generalize the table and tree merge viewer framework
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
9 files changed, 532 insertions(+), 246 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/AbstractTreeContentMergeViewer.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112074 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/112074 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/74/112074/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/74/112074/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 851656a] [527567] Provide support for a general property merge viewer
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
9 files changed, 2885 insertions(+), 4 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/show_advanced_properties.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/show_categories.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewer.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewer.properties
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewerCreator.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112432 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/112432 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/32/112432/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/32/112432/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD d069a97] [527858] Selecting a diff with conflicts fails
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 47 insertions(+), 7 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112442 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/112442 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/42/112442/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/42/112442/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 4dfc7a3] [527864] Prevent CMV lines to be broken after merging an add/delete diff
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 5 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/114663 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/114663 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/63/114663/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/63/114663/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a428611] Improve performance of AbstractCopyCommand.getChangedDiffs
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 6 insertions(+), 6 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115866 patch-set 5'
>> Cherry-picking https://git.eclipse.org/r/#/c/115866 patch-set 5
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/115866/5
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/115866/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD e1f1015] Improve performance of IDiffRelationshipComputer implementations
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
5 files changed, 253 insertions(+), 245 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115888 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/115888 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/88/115888/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/88/115888/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD dd6a056] Improve performance of the merging process
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 535 insertions(+), 137 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/113054 patch-set 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/113054 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/54/113054/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/54/113054/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2cfb086] [529882] Synchronize zoom levels and allow changing it in diagram CMV
Author: Camille Letavernier <cletavernier@xxxxxxxxxxxxxxxxx>
1 file changed, 102 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105183 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105183 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/83/105183/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/83/105183/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 1638670] SWTUtil.safeRedraw should check for disposed control
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 5 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105184 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105184 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/84/105184/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/84/105184/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a6447c4] Cache StructureMergeViewerFilter results
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 24 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105186 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105186 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/86/105186/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/86/105186/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8d36b00] AbstractStructuralFeatureAccessor.computeDifferences lazily
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 6 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105197 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105197 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/97/105197/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/97/105197/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 60625c8] Decrease progress monitoring overhead
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 80 insertions(+), 16 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105198 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105198 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/98/105198/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/98/105198/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD d3565e1] [521940] Prevent index out of bounds exception on empty SMV tree
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 37 insertions(+), 18 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105204 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105204 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/04/105204/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/04/105204/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f4fa80e] Avoid expensive notifications processing after compare editor is closed
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 3 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104384 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/104384 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/84/104384/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/84/104384/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
HEAD detached from cce6b49
You are currently cherry-picking commit 46156af.
Untracked files:
.Xauthority-2896572274841021861
.repository/
nothing added to commit but untracked files present
Build step 'Execute shell' marked build as failure
Terminating xvnc.
Not sending mail to unregistered user laurent.goubet@xxxxxxx
