[
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 #333
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/333/>
------------------------------------------
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 ed656bcff170ded01b666070132312865a647f75 (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 ed656bcff170ded01b666070132312865a647f75 (origin/master)
Checking out Revision ed656bcff170ded01b666070132312865a647f75 (origin/master)
Starting xvnc
[workspace] $ Xvnc :128 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson5353401266253695659.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson4613919913296782232.sh
07/07/2015 05:40:35 Xvnc version X.org/xf4vnc custom version
07/07/2015 05:40:35 Copyright (C) 2001-2004 Alan Hourihane.
07/07/2015 05:40:35 Copyright (C) 2000-2004 Constantin Kaplinsky
07/07/2015 05:40:35 Copyright (C) 1999 AT&T Laboratories Cambridge
07/07/2015 05:40:35 All Rights Reserved.
07/07/2015 05:40:35 See http://www.tightvnc.com/ for information on TightVNC
07/07/2015 05:40:35 See http://xf4vnc.sf.net for xf4vnc-specific information
07/07/2015 05:40:35 Desktop name 'x11' (hipp6:128)
07/07/2015 05:40:35 Protocol versions supported: 3.7, 3.3
07/07/2015 05:40:35 RGB format 8 8 8
07/07/2015 05:40:35 Listening for VNC connections on TCP port 6028
+ 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/27
[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/27 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6a57160] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Axel Richard <axel.richard@xxxxxxx>
27 files changed, 2181 insertions(+), 137 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/22
>From /gitroot/egit/egit
* branch refs/changes/72/22672/22 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6755758] [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 5cbc839] [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 2b1c0a3] 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/4
>From /gitroot/egit/egit
* branch refs/changes/45/34145/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 7e3dc9e] [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/6
>From /gitroot/egit/egit
* branch refs/changes/02/48302/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD fee1469] [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/4
>From /gitroot/egit/egit
* branch refs/changes/62/48462/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply a74e0f0... 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/
