[
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 #307
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/307/changes>
Changes:
[Matthias Sohn] Fix ClassCastException in GitModelSynchronizeParticipant
[Matthias Sohn] Fix NPE in CommitHelper.getHeadCommit
[Matthias Sohn] Fix SWTException "Widget is disposed" in BlameOperation
[Matthias Sohn] Fix SWTException "Widget is disposed" in BranchSelectionDialog
[Matthias Sohn] Don't suggest branch name for push from remote tracking branch
[Matthias Sohn] Update build to use Tycho 0.23
[Matthias Sohn] Fix tycho.scmUrl in pom.xml
[Matthias Sohn] Ignore build result folders for gitflow bundles
[Matthias Sohn] Fix that double click is needed to "Check/Uncheck All Repositories"
[Matthias Sohn] Fix broken spell checking in commit message and Staging view
[Matthias Sohn] Fixes potential NPE in CompareTreeView.
[Matthias Sohn] Update documentation for 4.0
[Matthias Sohn] Don't pre-select all repositories when opening RepositorySearchDialog
------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision c62ffbf50a7ca2ca821ffc1f749705b61be4d0ef (origin/stable-4.0)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 712d3a2bff24f66fd971aae4f0d588f49f79dcc3 (origin/stable-4.0)
Checking out Revision 712d3a2bff24f66fd971aae4f0d588f49f79dcc3 (origin/stable-4.0)
Starting xvnc
[workspace] $ Xvnc :12 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson4007458303832160717.sh
+ metacity --replace --sm-disable
09/06/2015 00:01:30 Xvnc version X.org/xf4vnc custom version
09/06/2015 00:01:30 Copyright (C) 2001-2004 Alan Hourihane.
09/06/2015 00:01:30 Copyright (C) 2000-2004 Constantin Kaplinsky
09/06/2015 00:01:30 Copyright (C) 1999 AT&T Laboratories Cambridge
09/06/2015 00:01:30 All Rights Reserved.
09/06/2015 00:01:30 See http://www.tightvnc.com/ for information on TightVNC
09/06/2015 00:01:30 See http://xf4vnc.sf.net for xf4vnc-specific information
09/06/2015 00:01:30 Desktop name 'x11' (hipp6:12)
09/06/2015 00:01:30 Protocol versions supported: 3.7, 3.3
09/06/2015 00:01:30 RGB format 8 8 8
09/06/2015 00:01:30 Listening for VNC connections on TCP port 5912
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8887959915847670727.sh
+ 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/25
[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/egit/egit
* branch refs/changes/74/22674/25 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD d07cf7d] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
27 files changed, 2181 insertions(+), 135 deletions(-)
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelWithDeepProjectTest.java
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
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/21
>From /gitroot/egit/egit
* branch refs/changes/72/22672/21 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD afa1bdb] [wip] Let the ModelProviders compare their own file formats.
Author: Axel Richard <axel.richard@xxxxxxx>
6 files changed, 415 insertions(+), 109 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/43528'
>> Cherry-picking https://git.eclipse.org/r/#/c/43528
+ git fetch /gitroot/egit/egit refs/changes/28/43528/6
>From /gitroot/egit/egit
* branch refs/changes/28/43528/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD aeaa055] [wip] Provide a remote mapping context to ModelProviders
Author: Alexandra Buzila <abuzila@xxxxxxxxxxxxxxxxx>
3 files changed, 121 insertions(+), 37 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/44571'
>> Cherry-picking https://git.eclipse.org/r/#/c/44571
+ git fetch /gitroot/egit/egit refs/changes/71/44571/1
>From /gitroot/egit/egit
* branch refs/changes/71/44571/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 87893ba] [wip] Comparison not work when model resource not exist in other branch
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 8 insertions(+), 1 deletion(-)
+ 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/4
>From /gitroot/egit/egit
* branch refs/changes/45/34145/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 55b0426] [DRAFT][Mailist discussion support] Solution 1.
Author: Axel Richard <axel.richard@xxxxxxx>
2 files changed, 54 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/48302/'
>> Cherry-picking https://git.eclipse.org/r/#/c/48302/
+ git fetch /gitroot/egit/egit refs/changes/02/48302/4
>From /gitroot/egit/egit
* branch refs/changes/02/48302/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 34da11a] [wip] Prefer selection adaption to ResourceMapping instead of IResource
Author: Stefan Dirix <sdirix@xxxxxxxxxxxxxxxxx>
4 files changed, 123 insertions(+), 60 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/48462/'
>> Cherry-picking https://git.eclipse.org/r/#/c/48462/
+ git fetch /gitroot/egit/egit refs/changes/62/48462/4
>From /gitroot/egit/egit
* branch refs/changes/62/48462/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 71ba8b3] Workaround to enable linking multiple resources to HistoryView
Author: Stefan Dirix <sdirix@xxxxxxxxxxxxxxxxx>
2 files changed, 93 insertions(+), 4 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/49429/'
>> Cherry-picking https://git.eclipse.org/r/#/c/49429/
+ git fetch /gitroot/egit/egit refs/changes/29/49429/1
>From /gitroot/egit/egit
* branch refs/changes/29/49429/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 712d3a2
You are currently cherry-picking commit d867c41.
Untracked files:
.Xauthority-4720954145672559379
.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/
