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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Matthias Sohn] Fix NPE in CommitGraphTable.doPaint()

[Matthias Sohn] Fix and re-include Easymport wizard

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision be2b62abd65ec3ff1d906c24e86f44f544e3c5b9 (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 8a8b0198eeb90fefb4ee6b9e7c0511f227dcc4e6 (origin/master)
Checking out Revision 8a8b0198eeb90fefb4ee6b9e7c0511f227dcc4e6 (origin/master)
Starting xvnc
[workspace] $ Xvnc :579 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson343626996946970780.sh
+ metacity --replace --sm-disable
08/05/2015 00:01:24 Xvnc version X.org/xf4vnc custom version
08/05/2015 00:01:24 Copyright (C) 2001-2004 Alan Hourihane.
08/05/2015 00:01:24 Copyright (C) 2000-2004 Constantin Kaplinsky
08/05/2015 00:01:24 Copyright (C) 1999 AT&T Laboratories Cambridge
08/05/2015 00:01:24 All Rights Reserved.
08/05/2015 00:01:24 See http://www.tightvnc.com/ for information on TightVNC
08/05/2015 00:01:24 See http://xf4vnc.sf.net for xf4vnc-specific information
08/05/2015 00:01:24 Desktop name 'x11' (hipp6:579)
08/05/2015 00:01:24 Protocol versions supported: 3.7, 3.3
08/05/2015 00:01:24 RGB format 8 8 8
08/05/2015 00:01:24 Listening for VNC connections on TCP port 6479
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8521872263257914883.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/19
[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/19 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8079721] [wip] Use a workspace-aware merging strategy when working from EGit
 Author: Axel Richard <axel.richard@xxxxxxx>
 27 files changed, 2170 insertions(+), 135 deletions(-)
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelTest.java
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelWithDeepProjectTest.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/LogicalModels.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/RecursiveModelMerger.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModel.java
 rename org.eclipse.egit.core/src/org/eclipse/egit/core/{synchronize => internal/storage}/GitLocalResourceVariant.java (79%)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22672'
>> Cherry-picking https://git.eclipse.org/r/#/c/22672
+ git fetch /gitroot/egit/egit refs/changes/72/22672/15
>From /gitroot/egit/egit
 * branch            refs/changes/72/22672/15 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 76cad06... [wip] Let the ModelProviders compare their own file formats.
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/