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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Matthias Sohn] Pin tycho-surefire-plugin version

[Matthias Sohn] Configure version of tycho-surefire-plugin in parent pom.xml

[Matthias Sohn] Focus file list in GitHistoryView when context menu is shown

[Matthias Sohn] Add missing @Override annotations to all EGit bundles

[Andrey Loskutov] [historyView] Added "Focus On This File" menu for selected file

------------------------------------------
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 0da61c5dd63a3fb79f293b785d5baae01c0c5be7 (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 8242f5ce70d8827ec0b143242f4c313428d81c6d (origin/master)
Checking out Revision 8242f5ce70d8827ec0b143242f4c313428d81c6d (origin/master)
Starting xvnc
[workspace] $ Xvnc :439 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson301051758351180599.sh
+ metacity --replace --sm-disable
18/09/2015 00:01:57 Xvnc version X.org/xf4vnc custom version
18/09/2015 00:01:57 Copyright (C) 2001-2004 Alan Hourihane.
18/09/2015 00:01:57 Copyright (C) 2000-2004 Constantin Kaplinsky
18/09/2015 00:01:57 Copyright (C) 1999 AT&T Laboratories Cambridge
18/09/2015 00:01:57 All Rights Reserved.
18/09/2015 00:01:57 See http://www.tightvnc.com/ for information on TightVNC
18/09/2015 00:01:57 See http://xf4vnc.sf.net for xf4vnc-specific information
18/09/2015 00:01:57 Desktop name 'x11' (hipp6:439)
18/09/2015 00:01:57 Protocol versions supported: 3.7, 3.3
18/09/2015 00:01:57 RGB format 8 8 8
18/09/2015 00:01:57 Listening for VNC connections on TCP port 6339
[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)
Xlib:  extension "RANDR" missing on display ":439.0".
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson7055084030351438250.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/33
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/33 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 4d417df... [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/