[
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 #122
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/122/changes>
Changes:
[Andrey Loskutov] Scalability: don't run incremental update if there are too many changes
[Matthias Sohn] Always run compare input calculation in background thread
[Matthias Sohn] Don't run indexDiff.diff() in UI thread
[Matthias Sohn] Implement hasChildren() to avoid diff calculation in UI thread
[Matthias Sohn] Don't run "Compare with previous" in UI thread
[Christian Halstrick] Open mergetool by default in staging view when in conflicting state
[Matthias Sohn] Jobs should not unnecessarily lock the workspace
[Matthias Sohn] UI Activator: allow tracing if workbench UI is active
[Matthias Sohn] Let staging view use submodule repos
[Matthias Sohn] Update readme to describe current state of symlink support
[Matthias Sohn] [stagingview] "Refresh" operation should indicate that view is "busy"
[Matthias Sohn] [stagingview] "Updating index" should indicate that view is "busy"
[Matthias Sohn] Lookup active window before opening commit selection dialog
[Matthias Sohn] EGit v3.7.0.201502031740-rc1
[Matthias Sohn] Prepare post 3.7.0.201502031740-rc1 builds
------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@8a55503
Using strategy: Default
Last Built Revision: Revision cfab4bc2c7469ec78c0d7dc11681f02b1b081b64 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@8a55503
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 8b6df73a9b04f5fa3acfc46d7341536ee09b3998 (origin/master)
Checking out Revision 8b6df73a9b04f5fa3acfc46d7341536ee09b3998 (origin/master)
Starting xvnc
[workspace] $ Xvnc :702 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson8982904361104512516.sh
+ metacity --replace --sm-disable
05/02/2015 00:02:02 Xvnc version X.org/xf4vnc custom version
05/02/2015 00:02:02 Copyright (C) 2001-2004 Alan Hourihane.
05/02/2015 00:02:02 Copyright (C) 2000-2004 Constantin Kaplinsky
05/02/2015 00:02:02 Copyright (C) 1999 AT&T Laboratories Cambridge
05/02/2015 00:02:02 All Rights Reserved.
05/02/2015 00:02:02 See http://www.tightvnc.com/ for information on TightVNC
05/02/2015 00:02:02 See http://xf4vnc.sf.net for xf4vnc-specific information
05/02/2015 00:02:02 Desktop name 'x11' (hipp3:702)
05/02/2015 00:02:02 Protocol versions supported: 3.7, 3.3
05/02/2015 00:02:02 RGB format 8 8 8
05/02/2015 00:02:02 Listening for VNC connections on TCP port 6602
[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)
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson929131418915740831.sh
+ 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/9
>From /gitroot/egit/egit
* branch refs/changes/71/22671/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 64206d2] 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/9
>From /gitroot/egit/egit
* branch refs/changes/73/22673/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD be45c59] Reduce duplication from the synchronize code
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
3 files changed, 220 insertions(+), 269 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/10
>From /gitroot/egit/egit
* branch refs/changes/74/22674/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD dec2ee2] Use a workspace-aware merging strategy when working from EGit
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
13 files changed, 766 insertions(+), 8 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/4
>From /gitroot/egit/egit
* branch refs/changes/48/25948/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c0e7afa] Enable logical merge support for projects not at repository root.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
4 files changed, 87 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/4
>From /gitroot/egit/egit
* branch refs/changes/71/30671/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5683019] 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/5
>From /gitroot/egit/egit
* branch refs/changes/58/34458/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 6dcc5eb... 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'
+ true
+ sed '/<<<<<<< HEAD\|=======\|import .*IPath;\|import .*Path;\|>>>>>>> .*/d' org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ mv sed.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD 3e2675f] Comparison with refs should allow merging when local data is used
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
5 files changed, 92 insertions(+), 69 deletions(-)
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/12
>From /gitroot/egit/egit
* branch refs/changes/72/22672/12 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply b8f5a0b... Let the ModelProviders compare their own file formats.
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/
