[
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 » oxygen-extras,JDK_1.8.0_Latest #625
|
See <https://hudson.eclipse.org/migration/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/625/changes>
Changes:
[lgoubet] Removing the Papyrus plugins and features from the EMF Compare git
[Laurent Goubet] [530250] Fix RecursiveModelMerger to be able to handle Git attributes
------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 625
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/migration/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@588d68e7
Using strategy: Default
Git Exe: git
Last Built Revision: Revision 9749f4c946a7208c50772ff34d9c27e6b3087d2f (origin/master)
Checkout:JDK_1.8.0_Latest / <https://hudson.eclipse.org/migration/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/ws/> - hudson.remoting.LocalChannel@588d68e7
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 61df78ddbc8f3059aa38a6b86c0f73de0f333582 (origin/master)
Checking out Revision 61df78ddbc8f3059aa38a6b86c0f73de0f333582 (origin/master)
$ pkill Xvnc
$ pkill Xrealvnc
$ sh -c "rm -f /tmp/.X*-lock /tmp/.X11-unix/X*"
Starting xvnc
[JDK_1.8.0_Latest] $ Xvnc :2001 -geometry 1024x768 -depth 24 -ac -SecurityTypes none -noreset
[JDK_1.8.0_Latest] $ /bin/sh -xe /tmp/hudson1748745953601761367.sh
Xvnc TigerVNC 1.4.1 - built ??? ?? ???? ??:??:??
Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)
See http://www.tigervnc.org for information on TigerVNC.
Underlying X server release 11502000, The X.Org Foundation
Initializing built-in extension VNC-EXTENSION
Initializing built-in extension Generic Event Extension
Initializing built-in extension SHAPE
Initializing built-in extension MIT-SHM
Initializing built-in extension XInputExtension
Initializing built-in extension XTEST
Initializing built-in extension BIG-REQUESTS
Initializing built-in extension SYNC
Initializing built-in extension XKEYBOARD
Initializing built-in extension XC-MISC
Initializing built-in extension XFIXES
Initializing built-in extension RENDER
Initializing built-in extension RANDR
Initializing built-in extension COMPOSITE
Initializing built-in extension DAMAGE
Initializing built-in extension MIT-SCREEN-SAVER
Initializing built-in extension DOUBLE-BUFFER
Initializing built-in extension RECORD
Initializing built-in extension DPMS
Initializing built-in extension Present
Initializing built-in extension X-Resource
Initializing built-in extension XVideo
Initializing built-in extension XVideo-MotionCompensation
Initializing built-in extension GLX
Wed Jan 24 22:01:53 2018
vncext: VNC extension running!
vncext: Listening for VNC connections on all interface(s), port 7901
vncext: created VNC server for screen 0
+ echo 'We de-activate the git tests for now as they currently fail.'
We de-activate the git tests for now as they currently fail.
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/91499 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/99/91499/3
[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!
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/99/91499/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 558e4f6] Add progress reporting for post processors
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 107 insertions(+), 21 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104681 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/104681 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/104681/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/104681/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD eb8833b] [522017] Bug 522017: Concurrency problems in ResourceComputationScheduler
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
2 files changed, 424 insertions(+), 51 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104766 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/104766 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/104766/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/104766/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 7aa1dc9] [522064] [UML] Profile-application version check too restrictive
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
14 files changed, 360 insertions(+), 17 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a3/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a4/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/left.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/origin.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/data/dynamic/a5/right.uml
create mode 100644 plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareIterables.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/102981/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/102981/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD b03d809] [516259] Introduce action to resolve multiple conflicts
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
27 files changed, 908 insertions(+), 228 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/AbstractMergeRunnableTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/MergeConflictingRunnableTest.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/accept_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/accept_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_non_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/merge_contained_non_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/reject_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/dtoolb16/reject_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/accept_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/accept_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_non_conflicting_diffs_to_left.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/merge_contained_non_conflicting_diffs_to_right.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/reject_contained_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/etoolb16/reject_contained_non_conflicting_diffs.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/AbstractMergeContainedAction.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeConflictingRunnable.java
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeContainedConflictingAction.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/97575 patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/97575 patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/97575/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/97575/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f9e92a0] [516248] Actions for previous/next unresolved change
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
12 files changed, 275 insertions(+), 110 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/next_unresolved_diff.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/prev_unresolved_diff.png
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectDiffAction.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104589 patch-set 7'
>> Cherry-picking https://git.eclipse.org/r/#/c/104589 patch-set 7
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/89/104589/7
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/89/104589/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD eda1cc9] [516248] Improve Navigatable caching
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 85 insertions(+), 63 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 10'
>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 10
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/105075/10
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/105075/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 0a45c5d] [521948] Support changing the state of diffs already in terminal state
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
12 files changed, 1214 insertions(+), 164 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/CommandStackEvent.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105221 patch-set 9'
>> Cherry-picking https://git.eclipse.org/r/#/c/105221 patch-set 9
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/21/105221/9
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/21/105221/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2fdf3e5] [522372] Introduce timeout for auto expansion and expand all behavior
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 257 insertions(+), 13 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105303 patch-set 9'
>> Cherry-picking https://git.eclipse.org/r/#/c/105303 patch-set 9
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/03/105303/9
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/03/105303/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ddccf3f] [522422] Label-based content viewer should clean up the toolbar
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 8 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105322 patch-set 11'
>> Cherry-picking https://git.eclipse.org/r/#/c/105322 patch-set 11
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/22/105322/11
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/22/105322/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply b510a21... [514079] Improve mirroring support
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.
Archiving artifacts
Recording test results
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
