[
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 #402
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/402/>
------------------------------------------
Started by user axel.richard@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Using strategy: Default
Git Exe: git
Last Built Revision: Revision d731994757fe6d4ffa076441124a22072de41898 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@56daa64
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision d731994757fe6d4ffa076441124a22072de41898 (origin/master)
Checking out Revision d731994757fe6d4ffa076441124a22072de41898 (origin/master)
Starting xvnc
[workspace] $ Xvnc :347 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8652604786829232741.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8108390718772047508.sh
11/09/2015 02:44:22 Xvnc version X.org/xf4vnc custom version
11/09/2015 02:44:22 Copyright (C) 2001-2004 Alan Hourihane.
11/09/2015 02:44:22 Copyright (C) 2000-2004 Constantin Kaplinsky
11/09/2015 02:44:22 Copyright (C) 1999 AT&T Laboratories Cambridge
11/09/2015 02:44:22 All Rights Reserved.
11/09/2015 02:44:22 See http://www.tightvnc.com/ for information on TightVNC
11/09/2015 02:44:22 See http://xf4vnc.sf.net for xf4vnc-specific information
11/09/2015 02:44:22 Desktop name 'x11' (hipp6:347)
11/09/2015 02:44:22 Protocol versions supported: 3.7, 3.3
11/09/2015 02:44:22 + echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22674'
RGB format 8 8 8
>> Cherry-picking https://git.eclipse.org/r/#/c/22674
+ git fetch /gitroot/egit/egit refs/changes/74/22674/33
11/09/2015 02:44:22 Listening for VNC connections on TCP port 6247
[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!
(EE) config/hal: NewInputDeviceRequest failed (2)
(EE) config/hal: NewInputDeviceRequest failed (2)
>From /gitroot/egit/egit
* branch refs/changes/74/22674/33 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8988761] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Axel Richard <axel.richard@xxxxxxx>
15 files changed, 700 insertions(+), 208 deletions(-)
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/LogicalModels.java
rename org.eclipse.egit.core/src/org/eclipse/egit/core/{synchronize => internal/storage}/GitLocalResourceVariant.java (76%)
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceGitBlobStorage.java
+ 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/28
>From /gitroot/egit/egit
* branch refs/changes/72/22672/28 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2c32108] [wip] Let the ModelProviders compare their own file formats.
Author: Axel Richard <axel.richard@xxxxxxx>
5 files changed, 425 insertions(+), 105 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 ea25123] [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/2
>From /gitroot/egit/egit
* branch refs/changes/71/44571/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 87c30dd] Comparison broken when model resource missing 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/5
>From /gitroot/egit/egit
* branch refs/changes/45/34145/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8e22117] [DRAFT][Mailist discussion support] Solution 1.
Author: Laurent Delaigue <laurent.delaigue@xxxxxxx>
2 files changed, 56 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/6
>From /gitroot/egit/egit
* branch refs/changes/02/48302/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 305cc73] [wip] Prefer selection adaption to ResourceMapping instead of IResource
Author: Axel Richard <axel.richard@xxxxxxx>
5 files changed, 145 insertions(+), 66 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/5
>From /gitroot/egit/egit
* branch refs/changes/62/48462/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 832cac8... Workaround to enable linking multiple resources to HistoryView
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/
