[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #223
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/223/>
------------------------------------------
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 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (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 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (origin/master)
Checking out Revision 02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (origin/master)
Starting xvnc
[workspace] $ Xvnc :831 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson3536159575452105866.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson1857533884356657233.sh
07/04/2015 04:21:24 Xvnc version X.org/xf4vnc custom version
07/04/2015 04:21:24 Copyright (C) 2001-2004 Alan Hourihane.
07/04/2015 04:21:24 Copyright (C) 2000-2004 Constantin Kaplinsky
07/04/2015 04:21:24 Copyright (C) 1999 AT&T Laboratories Cambridge
07/04/2015 04:21:24 All Rights Reserved.
07/04/2015 04:21:24 See http://www.tightvnc.com/ for information on TightVNC
07/04/2015 04:21:24 See http://xf4vnc.sf.net for xf4vnc-specific information
07/04/2015 04:21:24 Desktop name 'x11' (hipp6:831)
07/04/2015 04:21:24 Protocol versions supported: 3.7, 3.3
07/04/2015 04:21:24 RGB format 8 8 8
07/04/2015 04:21:24 Listening for VNC connections on TCP port 6731
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/42873'
>> Cherry-picking https://git.eclipse.org/r/#/c/42873
+ git fetch /gitroot/egit/egit refs/changes/73/42873/12
[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/73/42873/12 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ff727fc] Introduce internal API to integrate Team merging.
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
19 files changed, 2241 insertions(+), 1 deletion(-)
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProviderTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/ResourceVariantTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/VariantsTestCase.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitCachedResourceVariantTree.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantCache.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantFileRevision.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexResourceVariant.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ 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/17
>From /gitroot/egit/egit
* branch refs/changes/74/22674/17 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 2b0f86e... [wip] Use a workspace-aware merging strategy when working from EGit
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'
+ true
+ sed '/<<<<<<< HEAD\|=======\|/>>>>>>> .*/d' org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
sed: -e expression #1, char 26: unknown command: `>'
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD 8bf444d] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
27 files changed, 2178 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/34458'
>> Cherry-picking https://git.eclipse.org/r/#/c/34458
+ git fetch /gitroot/egit/egit refs/changes/58/34458/9
>From /gitroot/egit/egit
* branch refs/changes/58/34458/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 536a10a] [wip] Comparison with refs should allow merging when local data is used
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 8 insertions(+), 9 deletions(-)
+ 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/15
>From /gitroot/egit/egit
* branch refs/changes/72/22672/15 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD bd00df6] [wip] Let the ModelProviders compare their own file formats.
Author: Axel Richard <axel.richard@xxxxxxx>
6 files changed, 380 insertions(+), 105 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22851'
>> Cherry-picking https://git.eclipse.org/r/#/c/22851
+ git fetch /gitroot/egit/egit refs/changes/51/22851/10
>From /gitroot/egit/egit
* branch refs/changes/51/22851/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD bd16ee2] [wip] Fix regression when calling the merge tool on folders
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 41 insertions(+), 6 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/34145'
>> Cherry-picking https://git.eclipse.org/r/#/c/34145
+ git fetch /gitroot/egit/egit refs/changes/45/34145/2
>From /gitroot/egit/egit
* branch refs/changes/45/34145/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 2195dea... [DRAFT][Mailist discussion support] Solution 1.
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'
+ true
+ sed '/>>>>>>> .*/d' org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java
+ perl -pe 'BEGIN{undef $/;} s/<<<<<<<.*?=======\n//sm' sed.tmp
+ mv perl.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java
+ rm sed.tmp
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD 0729299] [DRAFT][Mailist discussion support] Solution 1.
Author: Arthur Daussy <arthur.daussy@xxxxxxx>
2 files changed, 56 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/43528'
>> Cherry-picking https://git.eclipse.org/r/#/c/43528
+ git fetch /gitroot/egit/egit refs/changes/28/43528/5
>From /gitroot/egit/egit
* branch refs/changes/28/43528/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5f928ad] [wip] Provide a remote mapping context to ModelProviders
Author: Alexandra Buzila <abuzila@xxxxxxxxxxxxxxxxx>
3 files changed, 121 insertions(+), 37 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/44571'
>> Cherry-picking https://git.eclipse.org/r/#/c/44571
+ git fetch /gitroot/egit/egit refs/changes/71/44571/1
>From /gitroot/egit/egit
* branch refs/changes/71/44571/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 62b00ec] [wip] Comparison not work when model resource not exist in other branch
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 8 insertions(+), 1 deletion(-)
[INFO] Using Maven 3 installation: Maven 3.0.5
[INFO] Checking Maven 3 installation environment
[workspace] $ /shared/common/apache-maven-3.0.5/bin/mvn --help
[INFO] Checking Maven 3 installation version
[INFO] Detected Maven 3 installation version: 3.0.5
[workspace] $ /shared/common/apache-maven-3.0.5/bin/mvn clean install -V -B -e -DPUBLISH_PATH=/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly -DTEST_PATH=/jobs/genie.emfcompare/egit.test.tmpdir -DTEST_PARAMS=-Degit.test.tmpdir=${TEST_PATH} -DJGIT_SITE=https://hudson.eclipse.org/emfcompare/job/jgit.hooks-master-nighly/lastSuccessfulBuild/artifact/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository/ -DEGIT_VERSION=4.0.0-SNAPSHOT -Dtest.vmparams=-Degit.test.tmpdir=/jobs/genie.emfcompare/egit.test.tmpdir -Djgit-site=https://hudson.eclipse.org/emfcompare/job/jgit.hooks-master-nighly/lastSuccessfulBuild/artifact/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository/ -Ddownload-publish-path=/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly -Declipse.p2.mirrors=false -Dmaven.ext.class.path=/home/hudson/genie.emfcompare/.hudson/maven/slavebundle/resources:/home/hudson/genie.emfcompare/.hudson/maven/slavebundle/lib/maven3-eventspy-3.0.jar:/home/hudson/genie.emfcompare/.hudson/war/webapp/WEB-INF/lib/hudson-remoting-3.0.3.jar -Dhudson.eventspy.port=46583 -Dmaven.repo.local=<https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/.maven/repo> -f pom.xml -P platform-mars -P other-os -P publish -q -fae
[DEBUG] Waiting for connection on port: 46583
Apache Maven 3.0.5 (r01de14724cdef164cd33c7c8c2fe155faf9602da; 2013-02-19 08:51:28-0500)
Maven home: /shared/common/apache-maven-3.0.5
Java version: 1.7.0_75, vendor: Oracle Corporation
Java home: /opt/public/common/jdk1.7.0_75.x64/jre
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "3.0.101-0.46-default", arch: "amd64", family: "unix"
[DEBUG] Connected to remote
[debug] execute contextualize
[debug] execute contextualize
[debug] execute contextualize
[debug] execute contextualize
[debug] execute contextualize
[INFO] o.h.m.e.h.MavenExecutionResultHandler - Build failed with exception(s)
[INFO] o.h.m.e.h.MavenExecutionResultHandler - [1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:0.22.0:compile (default-compile) on project org.eclipse.egit.core: Compilation failure
[DEBUG] Closing connection to remote
[ERROR] Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:0.22.0:compile (default-compile) on project org.eclipse.egit.core: Compilation failure: Compilation failure:
[ERROR] /jobs/genie.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java:[22]
[ERROR] <<<<<<< HEAD
[ERROR] ^^^^^^^^^^^^
[ERROR] Syntax error on tokens, delete these tokens
[ERROR] /jobs/genie.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java:[24]
[ERROR] =======
[ERROR] ^^^^^^^
[ERROR] Syntax error on tokens, delete these tokens
[ERROR] /jobs/genie.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java:[26]
[ERROR] >>>>>>> 2b0f86e... [wip] Use a workspace-aware merging strategy when working from EGit
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] Syntax error on tokens, delete these tokens
[ERROR] 3 problems (3 errors)
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:0.22.0:compile (default-compile) on project org.eclipse.egit.core: Compilation failure
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: copied.org.apache.maven.plugin.CompilationFailureException: Compilation failure
at copied.org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:418)
at org.eclipse.tycho.compiler.AbstractOsgiCompilerMojo.execute(AbstractOsgiCompilerMojo.java:254)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209)
... 19 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :org.eclipse.egit.core
[DEBUG] Waiting for process to finish
[DEBUG] Result: 1
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
