[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,jdk=JDK_1.8.0_Latest/502/changes>

Changes:

[Laurent Delaigue] [497566] Never alter files before save

[Laurent Delaigue] Merge test suite 'AtLeastLuna' with 'AllTests'

[Laurent Delaigue] Fix useless TODO markers in different places

[Laurent Delaigue] Depend on JDK-7

[Laurent Delaigue] Add @Override and depend on emf.edit 2.10.0+

[Laurent Delaigue] Remove trivial deprecated features

[Laurent Delaigue] Use try with resource where possible

[Laurent Delaigue] [510704] Add equivalent diffs in same conflict

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 502
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@254b715b
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 923bc2e649f75b629857a517e0531f33741a4e7d (origin/master)
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@254b715b
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision df499162002802e32144dc401e8ae7de00d31dbf (origin/master)
Checking out Revision df499162002802e32144dc401e8ae7de00d31dbf (origin/master)
Starting xvnc
[JDK_1.8.0_Latest] $ Xvnc :796 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[JDK_1.8.0_Latest] $ /bin/sh -xe /tmp/hudson5627998606367536717.sh
(EE) 
Fatal server error:
(EE) Server is already active for display 796
	If this server is no longer running, remove /tmp/.X796-lock
	and start again.
(EE) 
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/56353 patch-set 17'
>> Cherry-picking https://git.eclipse.org/r/#/c/56353 patch-set 17
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/53/56353/17
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/53/56353/17 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6e12114] Activation of all Git tests
 Author: Axel Richard <axel.richard@xxxxxxx>
 3 files changed, 31 insertions(+), 46 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/74103 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/74103 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/03/74103/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/03/74103/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply d9ceffc... [WIP] Fix RenamedControlledResourceTest
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/