[
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 #195
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/195/>
------------------------------------------
Started by user axel.richard@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision aa0ff9296db8122230f8b4978102da24bcb66ff6 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision aa0ff9296db8122230f8b4978102da24bcb66ff6 (origin/master)
Checking out Revision aa0ff9296db8122230f8b4978102da24bcb66ff6 (origin/master)
Starting xvnc
[workspace] $ Xvnc :351 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson1828334016936236900.sh
+ metacity --replace --sm-disable
26/03/2015 06:02:02 Xvnc version X.org/xf4vnc custom version
26/03/2015 06:02:02 Copyright (C) 2001-2004 Alan Hourihane.
26/03/2015 06:02:02 Copyright (C) 2000-2004 Constantin Kaplinsky
26/03/2015 06:02:02 Copyright (C) 1999 AT&T Laboratories Cambridge
26/03/2015 06:02:02 All Rights Reserved.
26/03/2015 06:02:02 See http://www.tightvnc.com/ for information on TightVNC
26/03/2015 06:02:02 See http://xf4vnc.sf.net for xf4vnc-specific information
26/03/2015 06:02:02 Desktop name 'x11' (hipp6:351)
26/03/2015 06:02:02 Protocol versions supported: 3.7, 3.3
26/03/2015 06:02:02 RGB format 8 8 8
26/03/2015 06:02:02 Listening for VNC connections on TCP port 6251
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson4302801573683384657.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/42873'
>> Cherry-picking https://git.eclipse.org/r/#/c/42873
+ git fetch /gitroot/egit/egit refs/changes/73/42873/7
[dix] Could not init font path element /usr/share/fonts/truetype/, removing from list!
[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!
[dix] Could not init font path element /usr/share/fonts/Type1/, removing from list!
[dix] Could not init font path element /usr/share/fonts/100dpi:unscaled, removing from list!
(EE) config/hal: NewInputDeviceRequest failed (2)
(EE) config/hal: NewInputDeviceRequest failed (2)
>From /gitroot/egit/egit
* branch refs/changes/73/42873/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD aa0c995] Introduce internal API to integrate Team merging
Author: Axel Richard <axel.richard@xxxxxxx>
19 files changed, 2077 insertions(+), 1 deletion(-)
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProviderTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/ResourceVariantTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/VariantsTestCase.java
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/GitResourceVariantFileRevision.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/11
>From /gitroot/egit/egit
* branch refs/changes/73/22673/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9d8123d] [wip] Reduce duplication from the synchronize code
Author: Axel Richard <axel.richard@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/13
>From /gitroot/egit/egit
* branch refs/changes/74/22674/13 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 5bb9505] [wip] Use a workspace-aware merging strategy when working from EGit
Author: Axel Richard <axel.richard@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/6
>From /gitroot/egit/egit
* branch refs/changes/48/25948/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9099cc8] [wip] Enable logical merge support for projects not at repository root.
Author: Axel Richard <axel.richard@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/6
>From /gitroot/egit/egit
* branch refs/changes/71/30671/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 58e5537] [wip] Allow pre-merging from Mapping Mergers in case of conflicts
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 9 insertions(+), 3 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36642'
>> Cherry-picking https://git.eclipse.org/r/#/c/36642
+ git fetch /gitroot/egit/egit refs/changes/42/36642/4
>From /gitroot/egit/egit
* branch refs/changes/42/36642/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 1baaf07] [wip] Fix random InterruptedException on merges
Author: Axel Richard <axel.richard@xxxxxxx>
1 file changed, 16 insertions(+), 12 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/8
>From /gitroot/egit/egit
* branch refs/changes/58/34458/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply c7c131d... [wip] 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
+ 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/15
>From /gitroot/egit/egit
* branch refs/changes/72/22672/15 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: 'cherry-pick' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: cherry-pick failed
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
