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

[hudsonbuild@xxxxxxxxxxx]

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

------------------------------------------
Started by user axel.richard@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision 274817ca5ed97a4ce20255ceb8b0056809063f5c (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 274817ca5ed97a4ce20255ceb8b0056809063f5c (origin/master)
Checking out Revision 274817ca5ed97a4ce20255ceb8b0056809063f5c (origin/master)
Starting xvnc
[workspace] $ Xvnc :464 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson6964848802932245223.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson1420118591460069641.sh
05/05/2015 03:58:31 Xvnc version X.org/xf4vnc custom version
05/05/2015 03:58:31 Copyright (C) 2001-2004 Alan Hourihane.
05/05/2015 03:58:31 Copyright (C) 2000-2004 Constantin Kaplinsky
05/05/2015 03:58:31 Copyright (C) 1999 AT&T Laboratories Cambridge
05/05/2015 03:58:31 All Rights Reserved.
05/05/2015 03:58:31 See http://www.tightvnc.com/ for information on TightVNC
05/05/2015 03:58:31 See http://xf4vnc.sf.net for xf4vnc-specific information
05/05/2015 03:58:31 Desktop name 'x11' (hipp6:464)
05/05/2015 03:58:31 Protocol versions supported: 3.7, 3.3
05/05/2015 03:58:31 RGB format 8 8 8
05/05/2015 03:58:31 Listening for VNC connections on TCP port 6364
+ 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/17
[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)
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/17 -> 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
+ true
+ sed '/<<<<<<< HEAD\|=======\|>>>>>>> .*/d' org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
+ mv sed.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
Can't open .git/MERGE_MSG: No such file or directory.
+ git commit -F .git/MERGE_MSG
error: 'commit' 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: Exiting because of an unresolved conflict.
U	org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
U	org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java
Terminating xvnc.
Recording test results
Archiving artifacts

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