[
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 #102
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/102/>
------------------------------------------
[...truncated 28 lines...]
Xlib: extension "RANDR" missing on display ":703.0".
Process leaked file descriptors. See http://wiki.hudson-ci.org/display/HUDSON/Spawning+processes+from+build for more information
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson2768345529804874686.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22671'
>> Cherry-picking https://git.eclipse.org/r/#/c/22671
+ git fetch /gitroot/egit/egit refs/changes/71/22671/9
>From /gitroot/egit/egit
* branch refs/changes/71/22671/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 94e9a5b] Introduce internal API to integrate Team merging
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
13 files changed, 1181 insertions(+), 1 deletion(-)
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/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/22673'
>> Cherry-picking https://git.eclipse.org/r/#/c/22673
+ git fetch /gitroot/egit/egit refs/changes/73/22673/9
>From /gitroot/egit/egit
* branch refs/changes/73/22673/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c8ce7ba] Reduce duplication from the synchronize code
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
3 files changed, 220 insertions(+), 269 deletions(-)
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/EmptyResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/SynchronizeDataTreeProvider.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/10
>From /gitroot/egit/egit
* branch refs/changes/74/22674/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD fec64d1] Use a workspace-aware merging strategy when working from EGit
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
13 files changed, 766 insertions(+), 8 deletions(-)
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
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/25948'
>> Cherry-picking https://git.eclipse.org/r/#/c/25948
+ git fetch /gitroot/egit/egit refs/changes/48/25948/4
>From /gitroot/egit/egit
* branch refs/changes/48/25948/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5dcd328] Enable logical merge support for projects not at repository root.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
4 files changed, 87 insertions(+), 57 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/30671'
>> Cherry-picking https://git.eclipse.org/r/#/c/30671
+ git fetch /gitroot/egit/egit refs/changes/71/30671/4
>From /gitroot/egit/egit
* branch refs/changes/71/30671/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 284c613] Allow pre-merging from Mapping Mergers in case of conflicts
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 9 insertions(+), 3 deletions(-)
+ 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/5
>From /gitroot/egit/egit
* branch refs/changes/58/34458/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 6dcc5eb... Comparison with refs should allow merging when local data is used
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\|=======\|import .*IPath;\|import .*Path;\|>>>>>>> .*/d' org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ mv sed.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD 7cd7bdc] Comparison with refs should allow merging when local data is used
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
5 files changed, 92 insertions(+), 69 deletions(-)
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/22672'
>> Cherry-picking https://git.eclipse.org/r/#/c/22672
+ git fetch /gitroot/egit/egit refs/changes/72/22672/11
>From /gitroot/egit/egit
* branch refs/changes/72/22672/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 200acd7] Let the ModelProviders compare their own file formats.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
6 files changed, 466 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/7
>From /gitroot/egit/egit
* branch refs/changes/51/22851/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD b96a9dd] Fix regression when calling the merge tool on folders
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 41 insertions(+), 6 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36642'
>> Cherry-picking https://git.eclipse.org/r/#/c/36642
+ git fetch /gitroot/egit/egit refs/changes/42/36642/2
>From /gitroot/egit/egit
* branch refs/changes/42/36642/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5c572d6] Fix random InterruptedException on merges
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 16 insertions(+), 12 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22990'
>> Cherry-picking https://git.eclipse.org/r/#/c/22990
+ git fetch /gitroot/egit/egit refs/changes/90/22990/5
>From /gitroot/egit/egit
* branch refs/changes/90/22990/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9644e04] Do not pass on an uninitialized scope to callers from GitScopeUtil
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
3 files changed, 27 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/30190'
>> Cherry-picking https://git.eclipse.org/r/#/c/30190
+ git fetch /gitroot/egit/egit refs/changes/90/30190/6
>From /gitroot/egit/egit
* branch refs/changes/90/30190/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 63f11f6] Extract convenience methods in a separate class from the tests
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
9 files changed, 429 insertions(+), 285 deletions(-)
create mode 100644 org.eclipse.egit.core.test/fragment.xml
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelProvider.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleResourceMapping.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleResourceMappingMerger.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/34574'
>> Cherry-picking https://git.eclipse.org/r/#/c/34574
+ git fetch /gitroot/egit/egit refs/changes/74/34574/2
>From /gitroot/egit/egit
* branch refs/changes/74/34574/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 1b00bdc] GitSubscriberMergeContextTest was failing on windows
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 15 insertions(+), 12 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/30191'
>> Cherry-picking https://git.eclipse.org/r/#/c/30191
+ git fetch /gitroot/egit/egit refs/changes/91/30191/5
>From /gitroot/egit/egit
* branch refs/changes/91/30191/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ecf4e7f] Introduce tests for the logical merging
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
2 files changed, 984 insertions(+), 12 deletions(-)
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelTest.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36026'
>> Cherry-picking https://git.eclipse.org/r/#/c/36026
+ git fetch /gitroot/egit/egit refs/changes/26/36026/6
>From /gitroot/egit/egit
* branch refs/changes/26/36026/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 01c7880] Provide access to the absolute path of the git storages
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
5 files changed, 73 insertions(+), 28 deletions(-)
rename org.eclipse.egit.core.test/src/org/eclipse/egit/core/{internal/storage/BlobStorageTest.java => storage/GitBlobStorageTest.java} (87%)
rename org.eclipse.egit.core/src/org/eclipse/egit/core/{internal/storage/BlobStorage.java => storage/GitBlobStorage.java} (69%)
+ 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
[detached HEAD cf33000] [DRAFT][Mailist discussion support] Solution 1.
Author: Arthur Daussy <arthur.daussy@xxxxxxx>
2 files changed, 55 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/34144'
>> Cherry-picking https://git.eclipse.org/r/#/c/34144
+ git fetch /gitroot/egit/egit refs/changes/44/34144/2
>From /gitroot/egit/egit
* branch refs/changes/44/34144/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ee9e551] [DRAFT][Mailist discussion support] Unit test.
Author: Arthur Daussy <arthur.daussy@xxxxxxx>
2 files changed, 165 insertions(+), 2 deletions(-)
+ perl -pe 's|(?<!Git)BlobStorage(?!_\|[A-Za-z])|GitBlobStorage|g' org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ perl -pe 's|(import org.eclipse.core.runtime.IProgressMonitor;)\n|$1\nimport org.eclipse.egit.core.storage.GitBlobStorage;\n|g' perl.tmp
+ mv perl1.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ rm perl.tmp
[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.modeling.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=3.6.0-SNAPSHOT -Dtest.vmparams=-Degit.test.tmpdir=/jobs/genie.modeling.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.modeling.emfcompare/.hudson/maven/slavebundle/resources:/home/hudson/genie.modeling.emfcompare/.hudson/maven/slavebundle/lib/maven3-eventspy-3.0.jar:/home/hudson/genie.modeling.emfcompare/.hudson/war/webapp/WEB-INF/lib/hudson-remoting-3.0.0.jar -Dhudson.eventspy.port=37065 -Dmaven.repo.local=<https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/.maven/repo> -f pom.xml -P platform-kepler -P other-os -P publish -fae
[DEBUG] Waiting for connection on port: 37065
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_51, vendor: Oracle Corporation
Java home: /opt/public/common/jdk1.7.0_51/jre
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "3.0.76-0.11-default", arch: "amd64", family: "unix"
[DEBUG] Connected to remote
[INFO] Error stacktraces are turned on.
[INFO] Scanning for projects...
[INFO] o.h.m.e.h.MavenExecutionResultHandler - Build failed with exception(s)
[INFO] o.h.m.e.h.MavenExecutionResultHandler - [1] org.apache.maven.InternalErrorException: Internal error: org.eclipse.tycho.core.osgitools.OsgiManifestParserException: Exception parsing OSGi MANIFEST /jobs/genie.modeling.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.ui/META-INF/MANIFEST.MF: The manifest line "<<<<<<< HEAD" is invalid; it has no colon ':' character after the header key.
[DEBUG] Closing connection to remote
[ERROR] Internal error: org.eclipse.tycho.core.osgitools.OsgiManifestParserException: Exception parsing OSGi MANIFEST /jobs/genie.modeling.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.ui/META-INF/MANIFEST.MF: The manifest line "<<<<<<< HEAD" is invalid; it has no colon ':' character after the header key. -> [Help 1]
org.apache.maven.InternalErrorException: Internal error: org.eclipse.tycho.core.osgitools.OsgiManifestParserException: Exception parsing OSGi MANIFEST /jobs/genie.modeling.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.ui/META-INF/MANIFEST.MF: The manifest line "<<<<<<< HEAD" is invalid; it has no colon ':' character after the header key.
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:168)
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: org.eclipse.tycho.core.osgitools.OsgiManifestParserException: Exception parsing OSGi MANIFEST /jobs/genie.modeling.emfcompare/egit.logical-master-nightly/workspace/org.eclipse.egit.ui/META-INF/MANIFEST.MF: The manifest line "<<<<<<< HEAD" is invalid; it has no colon ':' character after the header key.
at org.eclipse.tycho.core.osgitools.OsgiManifest.<init>(OsgiManifest.java:50)
at org.eclipse.tycho.core.osgitools.OsgiManifest.parse(OsgiManifest.java:152)
at org.eclipse.tycho.core.osgitools.DefaultBundleReader.loadManifestFile(DefaultBundleReader.java:100)
at org.eclipse.tycho.core.osgitools.DefaultBundleReader.loadManifestFromDirectory(DefaultBundleReader.java:96)
at org.eclipse.tycho.core.osgitools.DefaultBundleReader.doLoadManifest(DefaultBundleReader.java:58)
at org.eclipse.tycho.core.osgitools.DefaultBundleReader.loadManifest(DefaultBundleReader.java:49)
at org.eclipse.tycho.core.osgitools.OsgiBundleProject.readArtifactKey(OsgiBundleProject.java:140)
at org.eclipse.tycho.core.osgitools.OsgiBundleProject.setupProject(OsgiBundleProject.java:135)
at org.eclipse.tycho.core.resolver.DefaultTychoResolver.setupProject(DefaultTychoResolver.java:74)
at org.eclipse.tycho.core.maven.TychoMavenLifecycleParticipant.afterProjectsRead(TychoMavenLifecycleParticipant.java:72)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:274)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
... 11 more
Caused by: org.osgi.framework.BundleException: The manifest line "<<<<<<< HEAD" is invalid; it has no colon ':' character after the header key.
at org.eclipse.osgi.util.ManifestElement.parseBundleManifest(ManifestElement.java:550)
at org.eclipse.osgi.framework.util.Headers.parseManifest(Headers.java:280)
at org.eclipse.tycho.core.osgitools.OsgiManifest.<init>(OsgiManifest.java:44)
... 22 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/InternalErrorException
[DEBUG] Waiting for process to finish
[DEBUG] Result: 1
Terminating xvnc.
Window manager warning: Fatal IO error 11 (Resource temporarily unavailable) on display ':703'.
Archiving artifacts
Recording test results
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
