[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=juno/231/changes>

Changes:

[Philip Langer] [470332] Resolving a conflict causes loss of previous changes

[Laurent Goubet] Functional tests for the remote resolving and associated round-trip

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 231
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@56daa64
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 1576a85368b2c406da9ddbb829c433909663d604 (origin/master)
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@56daa64
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 3368e7f209930ef56aa4e2af980a1747b33c7c0e (origin/master)
Checking out Revision 3368e7f209930ef56aa4e2af980a1747b33c7c0e (origin/master)
Starting xvnc
[juno] $ Xvnc :190 -geometry 1024x768 -depth 24 -ac
[juno] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8283478033963532493.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/51482'
>> Cherry-picking https://git.eclipse.org/r/#/c/51482
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/82/51482/7
01/08/2015 02:01:52 Xvnc version X.org/xf4vnc custom version
01/08/2015 02:01:52 Copyright (C) 2001-2004 Alan Hourihane.
01/08/2015 02:01:52 Copyright (C) 2000-2004 Constantin Kaplinsky
01/08/2015 02:01:52 Copyright (C) 1999 AT&T Laboratories Cambridge
01/08/2015 02:01:52 All Rights Reserved.
01/08/2015 02:01:52 See http://www.tightvnc.com/ for information on TightVNC
01/08/2015 02:01:52 See http://xf4vnc.sf.net for xf4vnc-specific information
01/08/2015 02:01:52 Desktop name 'x11' (hipp6:190)
01/08/2015 02:01:52 Protocol versions supported: 3.7, 3.3
01/08/2015 02:01:52 RGB format 8 8 8
01/08/2015 02:01:52 Listening for VNC connections on TCP port 6090
[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/82/51482/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply e9bd395... [wip] Merge with new remote projects
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/