Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[emfcompare-build] [Hudson] Build failed in Hudson: egit-master-logical #18

See <https://hudson.eclipse.org/emfcompare/job/egit-master-logical/18/>

------------------------------------------
Started by user mikael.barbero@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit-master-logical/ws/> - hudson.remoting.LocalChannel@4f89e700
Using strategy: Default
Last Built Revision: Revision 721cdec164c611b11787a9256ea46b345aa70eea (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit-master-logical/ws/> - hudson.remoting.LocalChannel@4f89e700
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 721cdec164c611b11787a9256ea46b345aa70eea (origin/master)
Checking out Revision 721cdec164c611b11787a9256ea46b345aa70eea (origin/master)
Starting xvnc
[workspace] $ Xvnc :806 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson5078158183524874885.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson5703582689158621006.sh
03/10/2014 12:10:05 Xvnc version X.org/xf4vnc custom version
03/10/2014 12:10:05 Copyright (C) 2001-2004 Alan Hourihane.
03/10/2014 12:10:05 Copyright (C) 2000-2004 Constantin Kaplinsky
03/10/2014 12:10:05 Copyright (C) 1999 AT&T Laboratories Cambridge
03/10/2014 12:10:05 All Rights Reserved.
03/10/2014 12:10:05 See http://www.tightvnc.com/ for information on TightVNC
03/10/2014 12:10:05 See http://xf4vnc.sf.net for xf4vnc-specific information
03/10/2014 12:10:05 Desktop name 'x11' (hipp3:806)
03/10/2014 12:10:05 Protocol versions supported: 3.7, 3.3
03/10/2014 12:10:05 RGB format 8 8 8
03/10/2014 12:10:05 Listening for VNC connections on TCP port 6706
+ git fetch /gitroot/egit/egit refs/changes/70/22670/6
[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/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD abd31db] 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
+ git fetch /gitroot/egit/egit refs/changes/71/22671/6
>From /gitroot/egit/egit
 * branch            refs/changes/71/22671/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 173f72b] 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
+ git fetch /gitroot/egit/egit refs/changes/73/22673/6
>From /gitroot/egit/egit
 * branch            refs/changes/73/22673/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 38174d4] 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
+ git fetch /gitroot/egit/egit refs/changes/74/22674/8
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 45396e5... Use a workspace-aware merging strategy when working from EGit
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/


Back to the top