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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Matthias Sohn] Ensure commit body is retained in GitSynchronizeData

[Matthias Sohn] Update javax.servlet to 3.1

------------------------------------------
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 f89d20668477efa008a3fa920c3bb28006a9ca1f (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 a598313e659aa9dbf2c4b5c4ba64d82f27d7f4e0 (origin/master)
Checking out Revision a598313e659aa9dbf2c4b5c4ba64d82f27d7f4e0 (origin/master)
Starting xvnc
[workspace] $ Xvnc :17 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson7941331859347827538.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson4856960143620283846.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/20
11/05/2015 03:18:57 Xvnc version X.org/xf4vnc custom version
11/05/2015 03:18:57 Copyright (C) 2001-2004 Alan Hourihane.
11/05/2015 03:18:57 Copyright (C) 2000-2004 Constantin Kaplinsky
11/05/2015 03:18:57 Copyright (C) 1999 AT&T Laboratories Cambridge
11/05/2015 03:18:57 All Rights Reserved.
11/05/2015 03:18:57 See http://www.tightvnc.com/ for information on TightVNC
11/05/2015 03:18:57 See http://xf4vnc.sf.net for xf4vnc-specific information
11/05/2015 03:18:57 Desktop name 'x11' (hipp6:17)
11/05/2015 03:18:57 Protocol versions supported: 3.7, 3.3
11/05/2015 03:18:57 RGB format 8 8 8
11/05/2015 03:18:57 Listening for VNC connections on TCP port 5917
[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/20 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 21f174d] [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/16
>From /gitroot/egit/egit
 * branch            refs/changes/72/22672/16 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply dec46bb... [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/