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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Thomas Wolf] Fix automatic switch to list mode in staging view

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@224b16f5
Using strategy: Default
Git Exe: git
Last Built Revision: Revision e0375ecaa77f36222b2d7dc84e529f232e8a3eb4 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@224b16f5
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision b7c01fa09eb56548aa1a61ae1994d83cfb5f8f49 (origin/master)
Checking out Revision b7c01fa09eb56548aa1a61ae1994d83cfb5f8f49 (origin/master)
Starting xvnc
[workspace] $ Xvnc :688 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson2593385418635073965.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson3339396813329421342.sh
05/09/2016 00:01:15 Xvnc version X.org/xf4vnc custom version
05/09/2016 00:01:15 Copyright (C) 2001-2004 Alan Hourihane.
05/09/2016 00:01:15 Copyright (C) 2000-2004 Constantin Kaplinsky
05/09/2016 00:01:15 Copyright (C) 1999 AT&T Laboratories Cambridge
05/09/2016 00:01:15 All Rights Reserved.
05/09/2016 00:01:15 See http://www.tightvnc.com/ for information on TightVNC
05/09/2016 00:01:15 See http://xf4vnc.sf.net for xf4vnc-specific information
05/09/2016 00:01:15 Desktop name 'x11' (hipp6:688)
05/09/2016 00:01:15 Protocol versions supported: 3.7, 3.3
05/09/2016 00:01:15 RGB format 8 8 8
05/09/2016 00:01:15 Listening for VNC connections on TCP port 6588
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/43528'
>> Cherry-picking https://git.eclipse.org/r/#/c/43528
+ git fetch /gitroot/egit/egit refs/changes/28/43528/18
[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/28/43528/18 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: 'cherry-pick' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: cherry-pick failed
Terminating xvnc.
Recording test results
Archiving artifacts

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