[
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 #40
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/40/changes>
Changes:
[Laurent Goubet] New tests for merging through Team (GitSubscriberMergeContext).
[Laurent Goubet] Adding tests merging file deletions through team
------------------------------------------
Started by timer
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@b699872
Using strategy: Default
Last Built Revision: Revision fd9aa9ab7fab6a1d525bc0683f5c3fe5e10395d7 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@b699872
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 07fca3f5dda46def9bea26fc839cae91b2bb6a8e (origin/master)
Checking out Revision 07fca3f5dda46def9bea26fc839cae91b2bb6a8e (origin/master)
Starting xvnc
[workspace] $ Xvnc :717 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson7725490983046981607.sh
+ metacity --replace --sm-disable
12/10/2014 00:00:57 Xvnc version X.org/xf4vnc custom version
12/10/2014 00:00:57 Copyright (C) 2001-2004 Alan Hourihane.
12/10/2014 00:00:57 Copyright (C) 2000-2004 Constantin Kaplinsky
12/10/2014 00:00:57 Copyright (C) 1999 AT&T Laboratories Cambridge
12/10/2014 00:00:57 All Rights Reserved.
12/10/2014 00:00:57 See http://www.tightvnc.com/ for information on TightVNC
12/10/2014 00:00:57 See http://xf4vnc.sf.net for xf4vnc-specific information
12/10/2014 00:00:57 Desktop name 'x11' (hipp3:717)
12/10/2014 00:00:57 Protocol versions supported: 3.7, 3.3
12/10/2014 00:00:57 RGB format 8 8 8
12/10/2014 00:00:57 Listening for VNC connections on TCP port 6617
[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 ":717.0".
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson580931234822119048.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 0147354] 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 7cd314b] 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/34458'
>> Cherry-picking https://git.eclipse.org/r/#/c/34458
+ git fetch /gitroot/egit/egit refs/changes/58/34458/2
>From /gitroot/egit/egit
* branch refs/changes/58/34458/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c6a96bd] Comparison with refs should allow merging when local data is used
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
4 files changed, 80 insertions(+), 65 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/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 9b9945b] 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 2e5d792] 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/22672'
>> Cherry-picking https://git.eclipse.org/r/#/c/22672
+ git fetch /gitroot/egit/egit refs/changes/72/22672/9
>From /gitroot/egit/egit
* branch refs/changes/72/22672/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD f8b3d79] Let the ModelProviders compare their own file formats.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
6 files changed, 380 insertions(+), 105 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22851'
>> Cherry-picking https://git.eclipse.org/r/#/c/22851
+ git fetch /gitroot/egit/egit refs/changes/51/22851/6
>From /gitroot/egit/egit
* branch refs/changes/51/22851/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a757148] Fix regression when calling the merge tool on folders
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 41 insertions(+), 6 deletions(-)
+ 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 d1d8d0d] 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/22990'
>> Cherry-picking https://git.eclipse.org/r/#/c/22990
+ git fetch /gitroot/egit/egit refs/changes/90/22990/5
>From /gitroot/egit/egit
* branch refs/changes/90/22990/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 967c019] Do not pass on an uninitialized scope to callers from GitScopeUtil
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
3 files changed, 27 insertions(+), 2 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/14966'
>> Cherry-picking https://git.eclipse.org/r/#/c/14966
+ git fetch /gitroot/egit/egit refs/changes/66/14966/11
>From /gitroot/egit/egit
* branch refs/changes/66/14966/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 15295c8... New tests for merging through Team (GitSubscriberMergeContext).
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/
