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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Matthias Sohn] Always use EGitCredentialsProvider in EGit

[Matthias Sohn] Update documentation for 3.6.0

[Matthias Sohn] EGit v3.6.0.201412230720-r

[Matthias Sohn] Prepare 3.6.1-SNAPSHOT builds

[Matthias Sohn] Prepare 3.7.0-SNAPSHOT builds

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision aff73c5d3343ba469a554a3103c724ac09cf9b8c (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision f780e77d0f685a6efae28bbedf5b2d5d09851210 (origin/master)
Checking out Revision f780e77d0f685a6efae28bbedf5b2d5d09851210 (origin/master)
Starting xvnc
[workspace] $ Xvnc :314 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson3310839515268585227.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson8292214295343357760.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22670'
>> Cherry-picking https://git.eclipse.org/r/#/c/22670
+ git fetch /gitroot/egit/egit refs/changes/70/22670/7
25/12/2014 00:03:59 Xvnc version X.org/xf4vnc custom version
25/12/2014 00:03:59 Copyright (C) 2001-2004 Alan Hourihane.
25/12/2014 00:03:59 Copyright (C) 2000-2004 Constantin Kaplinsky
25/12/2014 00:03:59 Copyright (C) 1999 AT&T Laboratories Cambridge
25/12/2014 00:03:59 All Rights Reserved.
25/12/2014 00:03:59 See http://www.tightvnc.com/ for information on TightVNC
25/12/2014 00:03:59 See http://xf4vnc.sf.net for xf4vnc-specific information
25/12/2014 00:03:59 Desktop name 'x11' (hipp3:314)
25/12/2014 00:03:59 Protocol versions supported: 3.7, 3.3
25/12/2014 00:03:59 RGB format 8 8 8
25/12/2014 00:03:59 Listening for VNC connections on TCP port 6214
[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/70/22670/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 3fa2915] Prevent exception propagation when auto-staging moves or deletions.
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/FileDeleteHookTest.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22671'
>> Cherry-picking https://git.eclipse.org/r/#/c/22671
+ git fetch /gitroot/egit/egit refs/changes/71/22671/8
>From /gitroot/egit/egit
 * branch            refs/changes/71/22671/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 339efdb... Introduce internal API to integrate Team merging
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.
Archiving artifacts
Recording test results

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