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

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/333/changes>

Changes:

[Mathieu Cartaud] Add debug logging for merge actions

[Mathieu Cartaud] [484579] Fix merge consequences algorithm

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 333
Checkout:mars / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/ws/> - hudson.remoting.LocalChannel@73140e9f
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 3738422fda5350016922f0d43d31b31b0c8b5249 (origin/master)
Checkout:mars / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/ws/> - hudson.remoting.LocalChannel@73140e9f
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 341c5b1091ce188e7703750e8b61f8196cb90838 (origin/master)
Checking out Revision 341c5b1091ce188e7703750e8b61f8196cb90838 (origin/master)
Starting xvnc
[mars] $ Xvnc :181 -geometry 1024x768 -depth 24 -ac
[mars] $ /bin/sh -xe /tmp/genie.emfcompare/hudson1294291452066450768.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/56353'
>> Cherry-picking https://git.eclipse.org/r/#/c/56353
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/53/56353/12
08/01/2016 13:00:58 Xvnc version X.org/xf4vnc custom version
08/01/2016 13:00:58 Copyright (C) 2001-2004 Alan Hourihane.
08/01/2016 13:00:58 Copyright (C) 2000-2004 Constantin Kaplinsky
08/01/2016 13:00:58 Copyright (C) 1999 AT&T Laboratories Cambridge
08/01/2016 13:00:58 All Rights Reserved.
08/01/2016 13:00:58 See http://www.tightvnc.com/ for information on TightVNC
08/01/2016 13:00:58 See http://xf4vnc.sf.net for xf4vnc-specific information
08/01/2016 13:00:58 Desktop name 'x11' (hipp6:181)
08/01/2016 13:00:58 Protocol versions supported: 3.7, 3.3
08/01/2016 13:00:58 RGB format 8 8 8
08/01/2016 13:00:58 Listening for VNC connections on TCP port 6081
[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/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/53/56353/12 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6ab9c29] Activation of all Git tests
 Author: Axel Richard <axel.richard@xxxxxxx>
 3 files changed, 30 insertions(+), 37 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/62941'
>> Cherry-picking https://git.eclipse.org/r/#/c/62941
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/41/62941/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/41/62941/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 5196672... [484579] Fix merge consequences algorithm
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/