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

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/331/changes>

Changes:

[Matthias Sohn] Fix HTML page generated for p2 repository content

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Using strategy: Default
Git Exe: git
Last Built Revision: Revision d46e03b5cd2828d4a84153e0537d761f7f7fbc40 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision fc8e3810b511ea9d9ce3647533909afa06c6f5de (origin/master)
Checking out Revision fc8e3810b511ea9d9ce3647533909afa06c6f5de (origin/master)
Starting xvnc
[workspace] $ Xvnc :497 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson965555606622944093.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson4126697538540526165.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22674'
>> Cherry-picking https://git.eclipse.org/r/#/c/22674
+ git fetch /gitroot/egit/egit refs/changes/74/22674/26
07/07/2015 00:01:49 Xvnc version X.org/xf4vnc custom version
07/07/2015 00:01:49 Copyright (C) 2001-2004 Alan Hourihane.
07/07/2015 00:01:49 Copyright (C) 2000-2004 Constantin Kaplinsky
07/07/2015 00:01:49 Copyright (C) 1999 AT&T Laboratories Cambridge
07/07/2015 00:01:49 All Rights Reserved.
07/07/2015 00:01:49 See http://www.tightvnc.com/ for information on TightVNC
07/07/2015 00:01:49 See http://xf4vnc.sf.net for xf4vnc-specific information
07/07/2015 00:01:49 Desktop name 'x11' (hipp6:497)
07/07/2015 00:01:49 Protocol versions supported: 3.7, 3.3
07/07/2015 00:01:49 RGB format 8 8 8
07/07/2015 00:01:49 Listening for VNC connections on TCP port 6397
[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!
(EE) config/hal: NewInputDeviceRequest failed (2)
(EE) config/hal: NewInputDeviceRequest failed (2)
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/26 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 1fbec4f... [wip] Use a workspace-aware merging strategy when working from EGit
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/