[
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 » juno #147
|
See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/147/changes>
Changes:
[Axel Richard] Merge tool doesn't work on logical models.
[Laurent Delaigue] [463785] ResourceLocationChange: core changes.
[Laurent Delaigue] [463785] ResourceLocationChange: UI changes
------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 147
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision a94340ae6773ae6909c102041a13adef3a00bd99 (origin/master)
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision c3bc20a78884e4b9660181a155f8b77ef1d32ecc (origin/master)
Checking out Revision c3bc20a78884e4b9660181a155f8b77ef1d32ecc (origin/master)
Starting xvnc
[juno] $ Xvnc :577 -geometry 1024x768 -depth 24 -ac
[juno] $ /bin/sh -xe /tmp/genie.emfcompare/hudson865598857500426748.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36847'
>> Cherry-picking https://git.eclipse.org/r/#/c/36847
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/47/36847/7
05/05/2015 12:06:57 Xvnc version X.org/xf4vnc custom version
05/05/2015 12:06:57 Copyright (C) 2001-2004 Alan Hourihane.
05/05/2015 12:06:57 Copyright (C) 2000-2004 Constantin Kaplinsky
05/05/2015 12:06:57 Copyright (C) 1999 AT&T Laboratories Cambridge
05/05/2015 12:06:57 All Rights Reserved.
05/05/2015 12:06:57 See http://www.tightvnc.com/ for information on TightVNC
05/05/2015 12:06:57 See http://xf4vnc.sf.net for xf4vnc-specific information
05/05/2015 12:06:57 Desktop name 'x11' (hipp6:577)
05/05/2015 12:06:57 Protocol versions supported: 3.7, 3.3
05/05/2015 12:06:57 RGB format 8 8 8
05/05/2015 12:06:57 Listening for VNC connections on TCP port 6477
[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/emfcompare/org.eclipse.emf.compare
* branch refs/changes/47/36847/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD e0f72dd] DRAFT - display proper labels for the content merge viewer panes
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
11 files changed, 413 insertions(+), 27 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java
create mode 100644 plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/StoragePathAdapter.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/45466'
>> Cherry-picking https://git.eclipse.org/r/#/c/45466
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/45466/10
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/45466/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a8decec] Refactoring of ThreadedModelResolver.
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
46 files changed, 4910 insertions(+), 1921 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/DependencyGraphUpdaterTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ResolutionEventsTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ResourceComputationSchedulerTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractMonitoredProxyCreationListener.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResourceResolver.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DefaultImplicitDependencies.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DefaultResolutionContext.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DependencyFoundEvent.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DependencyGraphUpdater.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DiagnosticSupport.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IComputation.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IImplicitDependencies.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IResolutionContext.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IResourceDependencyLocalResolver.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IResourceDependencyProvider.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/IResourceDependencyRemoteResolver.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalModelResolution.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalModelsResolution.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalMonitoredProxyCreationListener.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalResolveComputation.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ModelResourceListener.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ModelResourceVisitor.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ModelsResolution.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/MonitorCallback.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/RemoteMonitoredProxyCreationListener.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/RemoteResolveComputation.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResolutionUtil.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResolvedEvent.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceComputationScheduler.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyFoundEvent.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyProvider.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceRemovedEvent.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceUnloader.java
rewrite plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ThreadedModelResolver.java (93%)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/47022'
>> Cherry-picking https://git.eclipse.org/r/#/c/47022
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/22/47022/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/22/47022/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ded888e] Added logs to ThreadedModelResolver and EMFCompare.
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
11 files changed, 246 insertions(+), 7 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/45813'
>> Cherry-picking https://git.eclipse.org/r/#/c/45813
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/13/45813/13
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/13/45813/13 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply d6bfb42... [463785] ResourceLocationChange: core changes
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/
