[
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 #278
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/278/>
------------------------------------------
Started by user axel.richard@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision af9f7d03e94e2dc813226c4df4cae73b97053c72 (origin/master)
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 af9f7d03e94e2dc813226c4df4cae73b97053c72 (origin/master)
Checking out Revision af9f7d03e94e2dc813226c4df4cae73b97053c72 (origin/master)
Starting xvnc
[workspace] $ Xvnc :402 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8904293386360573408.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8667987738405795573.sh
19/05/2015 06:55:22 Xvnc version X.org/xf4vnc custom version
19/05/2015 06:55:22 Copyright (C) 2001-2004 Alan Hourihane.
19/05/2015 06:55:22 Copyright (C) 2000-2004 Constantin Kaplinsky
19/05/2015 06:55:22 Copyright (C) 1999 AT&T Laboratories Cambridge
19/05/2015 06:55:22 All Rights Reserved.
19/05/2015 06:55:22 See http://www.tightvnc.com/ for information on TightVNC
19/05/2015 06:55:22 See http://xf4vnc.sf.net for xf4vnc-specific information
19/05/2015 06:55:22 Desktop name 'x11' (hipp6:402)
19/05/2015 06:55:22 Protocol versions supported: 3.7, 3.3
19/05/2015 06:55:22 RGB format 8 8 8
19/05/2015 06:55:22 Listening for VNC connections on TCP port 6302
+ 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/23
[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/23 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD b8c90ee] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Axel Richard <axel.richard@xxxxxxx>
27 files changed, 2170 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/20
>From /gitroot/egit/egit
* branch refs/changes/72/22672/20 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 691a87c] [wip] Let the ModelProviders compare their own file formats.
Author: Axel Richard <axel.richard@xxxxxxx>
6 files changed, 414 insertions(+), 106 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 15d19f0] [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 1ca783e] [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/3
>From /gitroot/egit/egit
* branch refs/changes/45/34145/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 52f35f5] [DRAFT][Mailist discussion support] Solution 1.
Author: Axel Richard <axel.richard@xxxxxxx>
2 files changed, 55 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36758/'
>> Cherry-picking https://git.eclipse.org/r/#/c/36758/
+ git fetch /gitroot/egit/egit refs/changes/58/36758/1
>From /gitroot/egit/egit
* branch refs/changes/58/36758/1 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 9fcd864... Consider the preference regarding the logical model in EGit operations
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/
