[
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 #61
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/61/>
------------------------------------------
Started by user laurent.goubet@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision 69874e5c096f32648e76a53624286abafeb80bcd (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 69874e5c096f32648e76a53624286abafeb80bcd (origin/master)
Checking out Revision 69874e5c096f32648e76a53624286abafeb80bcd (origin/master)
Starting xvnc
[workspace] $ Xvnc :539 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson7081730197933105124.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson8871423970621910018.sh
19/11/2014 05:52:55 Xvnc version X.org/xf4vnc custom version
19/11/2014 05:52:55 Copyright (C) 2001-2004 Alan Hourihane.
19/11/2014 05:52:55 Copyright (C) 2000-2004 Constantin Kaplinsky
19/11/2014 05:52:55 Copyright (C) 1999 AT&T Laboratories Cambridge
19/11/2014 05:52:55 All Rights Reserved.
19/11/2014 05:52:55 See http://www.tightvnc.com/ for information on TightVNC
19/11/2014 05:52:55 See http://xf4vnc.sf.net for xf4vnc-specific information
19/11/2014 05:52:55 Desktop name 'x11' (hipp3:539)
19/11/2014 05:52:55 Protocol versions supported: 3.7, 3.3
19/11/2014 05:52:55 RGB format 8 8 8
19/11/2014 05:52:55 Listening for VNC connections on TCP port 6439
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22670'
>> Cherry-picking https://git.eclipse.org/r/#/c/22670
+ git fetch /gitroot/egit/egit refs/changes/70/22670/7
[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/70/22670/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 32b7867] Prevent exception propagation when auto-staging moves or deletions.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
4 files changed, 92 insertions(+), 1 deletion(-)
create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/FileDeleteHookTest.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22671'
>> Cherry-picking https://git.eclipse.org/r/#/c/22671
+ git fetch /gitroot/egit/egit refs/changes/71/22671/7
>From /gitroot/egit/egit
* branch refs/changes/71/22671/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 8c5f7e8] Introduce internal API to integrate Team merging
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
13 files changed, 1181 insertions(+), 1 deletion(-)
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitCachedResourceVariantTree.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantCache.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/AbstractGitResourceVariant.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexResourceVariant.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22673'
>> Cherry-picking https://git.eclipse.org/r/#/c/22673
+ git fetch /gitroot/egit/egit refs/changes/73/22673/7
>From /gitroot/egit/egit
* branch refs/changes/73/22673/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD defdbf7] Reduce duplication from the synchronize code
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
3 files changed, 220 insertions(+), 267 deletions(-)
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/EmptyResourceVariantTreeProvider.java
create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/SynchronizeDataTreeProvider.java
+ 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/9
>From /gitroot/egit/egit
* branch refs/changes/74/22674/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5848fba] Use a workspace-aware merging strategy when working from EGit
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
13 files changed, 770 insertions(+), 6 deletions(-)
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
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/25948'
>> Cherry-picking https://git.eclipse.org/r/#/c/25948
+ git fetch /gitroot/egit/egit refs/changes/48/25948/3
>From /gitroot/egit/egit
* branch refs/changes/48/25948/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 81e3573] Enable logical merge support for projects not at repository root.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
4 files changed, 88 insertions(+), 57 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/30671'
>> Cherry-picking https://git.eclipse.org/r/#/c/30671
+ git fetch /gitroot/egit/egit refs/changes/71/30671/3
>From /gitroot/egit/egit
* branch refs/changes/71/30671/3 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD fb12966] Allow pre-merging from Mapping Mergers in case of conflicts
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 9 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/34458'
>> Cherry-picking https://git.eclipse.org/r/#/c/34458
+ git fetch /gitroot/egit/egit refs/changes/58/34458/4
>From /gitroot/egit/egit
* branch refs/changes/58/34458/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply fe34dcf... Comparison with refs should allow merging when local data is used
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.
Archiving artifacts
Recording test results
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
