[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[emfcompare-build] Build failed in Jenkins: master-build-on-egit-logical-nighlty » oxygen-extras,jdk1.8.0-latest #628
|
See <https://ci.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/PLATFORM=oxygen-extras,jdk=jdk1.8.0-latest/628/display/redirect>
------------------------------------------
[...truncated 19.61 KB...]
create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewerCreator.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112432 patch-set 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/112432 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/32/112432/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/32/112432/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 818ffdc] [527858] Selecting a diff with conflicts fails
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 47 insertions(+), 7 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/112442 patch-set 6'
>> Cherry-picking https://git.eclipse.org/r/#/c/112442 patch-set 6
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/42/112442/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/42/112442/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ee330b8] [527864] Prevent CMV lines to be broken after merging an add/delete diff
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 5 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/114663 patch-set 3'
>> Cherry-picking https://git.eclipse.org/r/#/c/114663 patch-set 3
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/63/114663/3
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/63/114663/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6d26958] Improve performance of AbstractCopyCommand.getChangedDiffs
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 6 insertions(+), 6 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115866 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/115866 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/115866/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/115866/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD cb7c2b9] Improve performance of IDiffRelationshipComputer implementations
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
5 files changed, 253 insertions(+), 245 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115888 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/115888 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/88/115888/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/88/115888/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD e736487] Improve performance of the merging process
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
6 files changed, 535 insertions(+), 137 deletions(-)
+ 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 3547908] 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 2437b59] 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 5cd4b88] 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 baef25b] 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 f8d93cb] [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 0f08e5b] 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 07b3461] [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/106202 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/106202 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/02/106202/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/02/106202/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9de395c] [525558] IdenticalResourceMinimizer should match URIs not only names
Author: Antonio Campesino <antonio.campesino.robles@xxxxxxxxxxxx>
2 files changed, 44 insertions(+), 12 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/106454 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/106454 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/54/106454/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/54/106454/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 3b38d4e] Allow loading referenced resources after the comparison is finished
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 1 insertion(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/110332 patch-set 2'
>> Cherry-picking https://git.eclipse.org/r/#/c/110332 patch-set 2
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/32/110332/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/32/110332/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD d913a88] Register the diagram CMV for any diff of diagram elements
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
7 files changed, 160 insertions(+), 60 deletions(-)
create mode 100644 plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/CompareDiagramUtil.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/106469 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/106469 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/69/106469/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/69/106469/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ae07962] [525286] [Papyrus] Diffs in invisible stereotype property visualizations not filtered out by default
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
1 file changed, 8 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111463 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/111463 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/63/111463/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/63/111463/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2059efa] Avoid visiting elements multiple times in Graph.ParentsIterator
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 18 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/111465 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/111465 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/65/111465/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/65/111465/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9c315fa] CMV switcher menu has duplicates viewing a string attribute diff
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 19 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/106114 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/106114 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/14/106114/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/14/106114/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD fcdaef3] [525473] [Papyrus] Connections disappear when comparing multiple diagrams
Author: Christian W. Damus <give.a.damus@xxxxxxxxx>
1 file changed, 10 insertions(+), 1 deletion(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/114659 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/114659 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/59/114659/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/59/114659/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 635125a] Improve performance of ComparisonSpec
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 81 insertions(+), 34 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/114661 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/114661 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/61/114661/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/61/114661/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 97d4f95] Improve performance of textual value matching
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 6 insertions(+), 8 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/114666 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/114666 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/66/114666/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/66/114666/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8d3916b] Improve performance of equality helper
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
2 files changed, 77 insertions(+), 62 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115857 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/115857 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/57/115857/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/57/115857/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2148cd0] Improve performance of ComparisionUtil
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 47 insertions(+), 46 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115860 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/115860 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/60/115860/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/60/115860/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 064ab5d] Improve performance of DiffUtil
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 242 insertions(+), 92 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115879 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/115879 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/79/115879/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/79/115879/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9aa0ec8] Improve IMerger registry implementation
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 51 insertions(+), 23 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/115970 patch-set 1'
>> Cherry-picking https://git.eclipse.org/r/#/c/115970 patch-set 1
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/70/115970/1
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/70/115970/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ed46358] Improve ManyStructuralFeatureAccessorImpl.getDiffWithValue(Object)
Author: Philip Langer <planger@xxxxxxxxxxxxxxxxx>
1 file changed, 16 insertions(+), 8 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/113054 patch-set 4'
>> Cherry-picking https://git.eclipse.org/r/#/c/113054 patch-set 4
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/54/113054/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
* branch refs/changes/54/113054/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 23a2411... [529882] Synchronize zoom levels and allow changing it in diagram CMV
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'
Build step 'Execute shell' marked build as failure
Terminating xvnc.
Not sending mail to unregistered user laurent.goubet@xxxxxxx
