[emfcompare-build] [Hudson] Build failed in Hudson: master-build-on-egit

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/545/>

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 545
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@5084b4ce
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 6b0705d7642b83bdd546cface671e619616dac9e (origin/master)
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@5084b4ce
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 6b0705d7642b83bdd546cface671e619616dac9e (origin/master)
Checking out Revision 6b0705d7642b83bdd546cface671e619616dac9e (origin/master)
Starting xvnc
[JDK_1.8.0_Latest] $ Xvnc :161 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[JDK_1.8.0_Latest] $ /bin/sh -xe /tmp/hudson4911000633425285799.sh

Xvnc TigerVNC 1.4.1 - built ??? ?? ???? ??:??:??
Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)
See http://www.tigervnc.org for information on TigerVNC.
Underlying X server release 11502000, The X.Org Foundation

Initializing built-in extension VNC-EXTENSION
Initializing built-in extension Generic Event Extension
Initializing built-in extension SHAPE
Initializing built-in extension MIT-SHM
Initializing built-in extension XInputExtension
Initializing built-in extension XTEST
Initializing built-in extension BIG-REQUESTS
Initializing built-in extension SYNC
Initializing built-in extension XKEYBOARD
Initializing built-in extension XC-MISC
Initializing built-in extension XFIXES
Initializing built-in extension RENDER
Initializing built-in extension RANDR
Initializing built-in extension COMPOSITE
Initializing built-in extension DAMAGE
Initializing built-in extension MIT-SCREEN-SAVER
Initializing built-in extension DOUBLE-BUFFER
Initializing built-in extension RECORD
Initializing built-in extension DPMS
Initializing built-in extension Present
Initializing built-in extension X-Resource
Initializing built-in extension XVideo
Initializing built-in extension XVideo-MotionCompensation
Initializing built-in extension GLX

Wed Apr 12 20:29:22 2017
 vncext:      VNC extension running!
 vncext:      Listening for VNC connections on all interface(s), port 6061
 vncext:      created VNC server for screen 0
+ echo 'We de-activate the git tests for now as they currently fail.'
We de-activate the git tests for now as they currently fail.
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/88656 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/88656 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/56/88656/7
[dix] Could not init font path element /usr/share/fonts/TTF/, removing from list!
[dix] Could not init font path element /usr/share/fonts/OTF/, removing from list!
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/56/88656/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f1425f7] [510442] Fix NPE in MergeViewerItemProviderConfiguration
 Author: Stefan Dirix <sdirix@xxxxxxxxxxxxxxxxx>
 2 files changed, 44 insertions(+), 8 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93725 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/93725 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/25/93725/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/25/93725/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 41efc80] [514079] Default to TextMergeViewer resources for icons/labels/tooltips
 Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
 8 files changed, 105 insertions(+), 237 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewerResourceBundle.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93726 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/93726 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/26/93726/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/26/93726/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c739f0c] [514079] Deactivate Swap left/right side for content merge viewers
 Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
 7 files changed, 597 insertions(+), 2 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/SwitchLeftAndRightUtil.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/MirroredTableContentMergeViewerContentProvider.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/MirroredEMFCompareTextMergeViewerContentProvider.java
 create 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/93041/ patch-set 9'
>> Cherry-picking https://git.eclipse.org/r/#/c/93041/ patch-set 9
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/41/93041/9
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/41/93041/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2616f4a] [514382] Pre-Merge on conflict can lead to data loss
 Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
 4 files changed, 175 insertions(+), 8 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/EMFResourceMappingMergerPreMergeTest.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/data/premerge/bug_preMergeWithConflict.zip
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/93188 patch-set 15'
>> Cherry-picking https://git.eclipse.org/r/#/c/93188 patch-set 15
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/88/93188/15
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/88/93188/15 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 6319462... [512677] Register EMFModelProvider for new Papyrus resources
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Terminating xvnc.
Recording test results
Archiving artifacts

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/