Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[emfcompare-build] [Hudson] Build failed in Hudson: master-build-on-egit-logical-nighlty » helios #267

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

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 267
Checkout:helios / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=helios/ws/> - hudson.remoting.LocalChannel@56daa64
Using strategy: Default
Git Exe: git
Last Built Revision: Revision a68638b83624157466a114a3597fa3ba866f8d97 (origin/master)
Checkout:helios / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=helios/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 a68638b83624157466a114a3597fa3ba866f8d97 (origin/master)
Checking out Revision a68638b83624157466a114a3597fa3ba866f8d97 (origin/master)
Starting xvnc
[helios] $ Xvnc :262 -geometry 1024x768 -depth 24 -ac
[helios] $ /bin/sh -xe /tmp/genie.emfcompare/hudson6043388302685556852.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/55294'
>> Cherry-picking https://git.eclipse.org/r/#/c/55294
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/94/55294/5
16/09/2015 10:42:32 Xvnc version X.org/xf4vnc custom version
16/09/2015 10:42:32 Copyright (C) 2001-2004 Alan Hourihane.
16/09/2015 10:42:32 Copyright (C) 2000-2004 Constantin Kaplinsky
16/09/2015 10:42:32 Copyright (C) 1999 AT&T Laboratories Cambridge
16/09/2015 10:42:32 All Rights Reserved.
16/09/2015 10:42:32 See http://www.tightvnc.com/ for information on TightVNC
16/09/2015 10:42:32 See http://xf4vnc.sf.net for xf4vnc-specific information
16/09/2015 10:42:32 Desktop name 'x11' (hipp6:262)
16/09/2015 10:42:32 Protocol versions supported: 3.7, 3.3
16/09/2015 10:42:32 RGB format 8 8 8
16/09/2015 10:42:32 Listening for VNC connections on TCP port 6162
[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/94/55294/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 4ed1ad9] Add RecursiveModelMerge through EGit mergeStrategy extension point v2
 Author: Axel Richard <axel.richard@xxxxxxx>
 23 files changed, 2178 insertions(+), 40 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/MergeText.java
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/StrategyRecursiveModel.java
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/mergetext.properties
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/fragment.xml
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/StrategyRecursiveModelTest.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/StrategyRecursiveModelWithDeepProjectTest.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/ModelTestCase.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleModelAdapterFactory.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleModelProvider.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleResourceMapping.java
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleResourceMappingMerger.java
+ 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/14
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/82/51482/14 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
	plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java
	plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/IStoragePathProvider2.java
Please move or remove them before you can merge.
Aborting
Terminating xvnc.
Recording test results
Archiving artifacts

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/


Back to the top