[
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 #611
|
See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=oxygen-extras,jdk=JDK_1.8.0_Latest/611/changes>
Changes:
[Laurent Goubet] API break in JGit 4.9 due to the fix for bug 517128
[Laurent Goubet] [525557] Rigth Taversal override with Base traversal when combining two
------------------------------------------
[...truncated 30 lines...]
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
Tue Oct 10 00:31:11 2017
vncext: VNC extension running!
vncext: Listening for VNC connections on all interface(s), port 6372
vncext: created VNC server for screen 0
[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 deff9f0] 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/98242 patch-set 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/98242 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/42/98242/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/42/98242/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 545a25d] [516257] Show diagram changes in the context of the UML model
Author: Tobias Ortmayr <tortmayr.ext@xxxxxxxxxxxxxxxxx>
2 files changed, 380 insertions(+)
create mode 100644 plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/structuremergeviewer/groups/impl/PapyrusGroupProvider.java
+ 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 0396a86] [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 799f88f] [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 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/102981 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/81/102981/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/81/102981/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 86f06ce] [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 8'
>> Cherry-picking https://git.eclipse.org/r/#/c/97575 patch-set 8
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/97575/8
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/97575/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 84d18d5] [516248] Actions for previous/next unresolved change
Author: Martin Fleck <mfleck@xxxxxxxxxxxxxxxxx>
12 files changed, 276 insertions(+), 111 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 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/104589 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/89/104589/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/89/104589/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c6b3a12] [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 5'
>> Cherry-picking https://git.eclipse.org/r/#/c/105075 patch-set 5
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/75/105075/5
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/75/105075/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 089d54c] [521948] Support changing the state of diffs already in terminal state
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
12 files changed, 1151 insertions(+), 158 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 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/105221 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/21/105221/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/21/105221/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 4087105] [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 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/105303 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/03/105303/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/03/105303/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 794a21c] [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 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/105322 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/22/105322/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/22/105322/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2c4ee47] [514079] Improve mirroring support
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
43 files changed, 1400 insertions(+), 1347 deletions(-)
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MirrorUtil.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/MirroredTableContentMergeViewerContentProvider.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/MirroredEMFCompareTextMergeViewerContentProvider.java
delete mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/MirroredTreeContentMergeViewerContentProvider.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105183 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105183 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/83/105183/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/83/105183/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 416c87c] SWTUtil.safeRedraw should check for disposed control
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 5 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105184 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105184 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/84/105184/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/84/105184/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ca69021] Cache StructureMergeViewerFilter results
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 24 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105186 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105186 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/86/105186/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/86/105186/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ef4270b] AbstractStructuralFeatureAccessor.computeDifferences lazily
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 6 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105197 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105197 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/97/105197/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/97/105197/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f03033b] Decrease progress monitoring overhead
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 80 insertions(+), 16 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105198 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105198 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/98/105198/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/98/105198/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5fb172c] [521940] Prevent index out of bounds exception on empty SMV tree
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 37 insertions(+), 18 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/105204 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/105204 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/04/105204/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/04/105204/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 7f9355d] Avoid expensive notifications processing after compare editor is closed
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 3 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/104384 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/104384 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/84/104384/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/84/104384/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2005460] [521886] Avoid validation in EMFCompareEditingDomain
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 49 insertions(+), 5 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/106201 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/106201 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/01/106201/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/01/106201/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
HEAD detached from 1d50199
You are currently cherry-picking commit 7b18982.
Untracked files:
.Xauthority-2326456150574276673
.maven/
nothing added to commit but untracked files present
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
