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

[hudsonbuild@xxxxxxxxxxx]

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

------------------------------------------
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 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (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 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (origin/master)
Checking out Revision 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (origin/master)
Starting xvnc
[workspace] $ Xvnc :659 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8796042449874404542.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson2093549020502111211.sh
07/04/2015 04:04:56 Xvnc version X.org/xf4vnc custom version
07/04/2015 04:04:56 Copyright (C) 2001-2004 Alan Hourihane.
07/04/2015 04:04:56 Copyright (C) 2000-2004 Constantin Kaplinsky
07/04/2015 04:04:56 Copyright (C) 1999 AT&T Laboratories Cambridge
07/04/2015 04:04:56 All Rights Reserved.
07/04/2015 04:04:56 See http://www.tightvnc.com/ for information on TightVNC
07/04/2015 04:04:56 See http://xf4vnc.sf.net for xf4vnc-specific information
07/04/2015 04:04:56 Desktop name 'x11' (hipp6:659)
07/04/2015 04:04:56 Protocol versions supported: 3.7, 3.3
07/04/2015 04:04:56 RGB format 8 8 8
07/04/2015 04:04:56 Listening for VNC connections on TCP port 6559
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/42873'
>> Cherry-picking https://git.eclipse.org/r/#/c/42873
+ git fetch /gitroot/egit/egit refs/changes/73/42873/12
[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/73/42873/12 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 11438ac] Introduce internal API to integrate Team merging.
 Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
 19 files changed, 2241 insertions(+), 1 deletion(-)
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProviderTest.java
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/ResourceVariantTest.java
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/VariantsTestCase.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitCachedResourceVariantTree.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantCache.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantFileRevision.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeProvider.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexResourceVariant.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ 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
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/17 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 2b0f86e... [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/