[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=luna/134/changes>

Changes:

[Laurent Delaigue] [460773] Register model resolver on model file extensions.

[Laurent Delaigue] [461697] Add SaveParameter Hook for Papyrus model files

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 134
Checkout:luna / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=luna/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision 9ac0fbfe28a9a8af2bb6875666929e0b8fb7dcf3 (origin/master)
Checkout:luna / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=luna/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 701e903503211a09831975a97b7d30f3e36d2e54 (origin/master)
Checking out Revision 701e903503211a09831975a97b7d30f3e36d2e54 (origin/master)
Starting xvnc
[luna] $ Xvnc :908 -geometry 1024x768 -depth 24 -ac
[luna] $ /bin/sh -xe /tmp/genie.emfcompare/hudson240650419784359485.sh
+ sed -i.bak s#http://download.eclipse.org/egit/updates-nightly#https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/lastSuccessfulBuild/artifact/org.eclipse.egit.repository/target/repository/#g <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=luna/ws/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target>
30/04/2015 02:07:15 Xvnc version X.org/xf4vnc custom version
30/04/2015 02:07:15 Copyright (C) 2001-2004 Alan Hourihane.
30/04/2015 02:07:15 Copyright (C) 2000-2004 Constantin Kaplinsky
30/04/2015 02:07:15 Copyright (C) 1999 AT&T Laboratories Cambridge
30/04/2015 02:07:15 All Rights Reserved.
30/04/2015 02:07:15 See http://www.tightvnc.com/ for information on TightVNC
30/04/2015 02:07:15 See http://xf4vnc.sf.net for xf4vnc-specific information
30/04/2015 02:07:15 Desktop name 'x11' (hipp6:908)
30/04/2015 02:07:15 Protocol versions supported: 3.7, 3.3
30/04/2015 02:07:15 RGB format 8 8 8
30/04/2015 02:07:15 Listening for VNC connections on TCP port 6808
[dix] Could not init font path element /usr/share/fonts/truetype/, removing from list!
[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!
[dix] Could not init font path element /usr/share/fonts/Type1/, removing from list!
[dix] Could not init font path element /usr/share/fonts/100dpi:unscaled, removing from list!
(EE) config/hal: NewInputDeviceRequest failed (2)
(EE) config/hal: NewInputDeviceRequest failed (2)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35541'
>> Cherry-picking https://git.eclipse.org/r/#/c/35541
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/41/35541/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/41/35541/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 1913f2c] Merge tool doesn't work on logical models
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 5 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFSynchronizationCompareAdapter.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36847'
>> Cherry-picking https://git.eclipse.org/r/#/c/36847
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/47/36847/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/47/36847/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 4a19873] DRAFT - display proper labels for the content merge viewer panes
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 11 files changed, 413 insertions(+), 27 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/StoragePathAdapter.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/44974'
>> Cherry-picking https://git.eclipse.org/r/#/c/44974
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/74/44974/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/74/44974/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c1f4b38] [460773] Listen to resource creation during merge.
 Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
 1 file changed, 56 insertions(+), 17 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/44979'
>> Cherry-picking https://git.eclipse.org/r/#/c/44979
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/79/44979/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/79/44979/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 53669bb... [460773] Register model resolver on papyrus file extensions.
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/