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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Matthias Sohn] Fix GitRepositoriesViewHandlingTest.testAddRepoButton()

[Matthias Sohn] EGit v4.0.0.201506090130-r

[Matthias Sohn] Prepare 4.0.1-SNAPSHOT builds

------------------------------------------
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 712d3a2bff24f66fd971aae4f0d588f49f79dcc3 (origin/stable-4.0)
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 935bfdfdc6f77ee1638a23af58b4b215281de8f5 (origin/stable-4.0)
Checking out Revision 935bfdfdc6f77ee1638a23af58b4b215281de8f5 (origin/stable-4.0)
Starting xvnc
[workspace] $ Xvnc :45 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson3887334085584738763.sh
10/06/2015 00:02:49 Xvnc version X.org/xf4vnc custom version
10/06/2015 00:02:49 Copyright (C) 2001-2004 Alan Hourihane.
10/06/2015 00:02:49 Copyright (C) 2000-2004 Constantin Kaplinsky
10/06/2015 00:02:49 Copyright (C) 1999 AT&T Laboratories Cambridge
10/06/2015 00:02:49 All Rights Reserved.
10/06/2015 00:02:49 See http://www.tightvnc.com/ for information on TightVNC
10/06/2015 00:02:49 See http://xf4vnc.sf.net for xf4vnc-specific information
10/06/2015 00:02:49 Desktop name 'x11' (hipp6:45)
10/06/2015 00:02:49 Protocol versions supported: 3.7, 3.3
10/06/2015 00:02:49 RGB format 8 8 8
10/06/2015 00:02:49 Listening for VNC connections on TCP port 5945
[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)
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson7661150135332894035.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/25
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/25 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a22b9e4] [wip] Use a workspace-aware merging strategy when working from EGit
 Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
 27 files changed, 2181 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/21
>From /gitroot/egit/egit
 * branch            refs/changes/72/22672/21 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply d623849... [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/