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.logical-master-nightly #74

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

Changes:

[Matthias Sohn] Fix NPE in GitResourceVariantTreeSubscriber.roots()

[Matthias Sohn] [rebaseView] Prevent SWTException if tree is disposed

[Matthias Sohn] Change feature name of mylyn feature to simplify finding it

[Matthias Sohn] Fix broken link to squash icon used in commandImages extension

[Robin Stocker] [repoView] Fix ClassCastException on add to index on folder

[Matthias Sohn] [historyView] Fix cancel with Modify > Edit and uncommitted changes

[Matthias Sohn] Fix missing trailing newline with "Create Patch"

[Matthias Sohn] Fix icon representing commit object in "Push Branch..." wizard

------------------------------------------
Started by timer
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision a4a68b96f6544aeb5b7bf3faab82655b0fcc2994 (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 ee656ee0ec37063973aa5b1b4c5376ead80cb52f (origin/master)
Checking out Revision ee656ee0ec37063973aa5b1b4c5376ead80cb52f (origin/master)
Starting xvnc
[workspace] $ Xvnc :643 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson3259008249244857478.sh
+ metacity --replace --sm-disable
23/11/2014 00:02:18 Xvnc version X.org/xf4vnc custom version
23/11/2014 00:02:18 Copyright (C) 2001-2004 Alan Hourihane.
23/11/2014 00:02:18 Copyright (C) 2000-2004 Constantin Kaplinsky
23/11/2014 00:02:18 Copyright (C) 1999 AT&T Laboratories Cambridge
23/11/2014 00:02:18 All Rights Reserved.
23/11/2014 00:02:18 See http://www.tightvnc.com/ for information on TightVNC
23/11/2014 00:02:18 See http://xf4vnc.sf.net for xf4vnc-specific information
23/11/2014 00:02:18 Desktop name 'x11' (hipp3:643)
23/11/2014 00:02:18 Protocol versions supported: 3.7, 3.3
23/11/2014 00:02:18 RGB format 8 8 8
23/11/2014 00:02:18 Listening for VNC connections on TCP port 6543
[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)
Xlib:  extension "RANDR" missing on display ":643.0".
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson2792845201899196500.sh
+ 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
>From /gitroot/egit/egit
 * branch            refs/changes/70/22670/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 54a8078] 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 f2897ed] 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
error: could not apply 77401e3... Reduce duplication from the synchronize code
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