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 #120

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

Changes:

[Matthias Sohn] Prepare 4.0.0-SNAPSHOT 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 2729907cec4b96d156f427027eb0b6d63171b439 (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 cfab4bc2c7469ec78c0d7dc11681f02b1b081b64 (origin/master)
Checking out Revision cfab4bc2c7469ec78c0d7dc11681f02b1b081b64 (origin/master)
Starting xvnc
[workspace] $ Xvnc :201 -geometry 1024x768 -depth 24 -ac
29/01/2015 00:01:43 Xvnc version X.org/xf4vnc custom version
29/01/2015 00:01:43 Copyright (C) 2001-2004 Alan Hourihane.
29/01/2015 00:01:43 Copyright (C) 2000-2004 Constantin Kaplinsky
29/01/2015 00:01:43 Copyright (C) 1999 AT&T Laboratories Cambridge
29/01/2015 00:01:43 All Rights Reserved.
29/01/2015 00:01:43 See http://www.tightvnc.com/ for information on TightVNC
29/01/2015 00:01:43 See http://xf4vnc.sf.net for xf4vnc-specific information
29/01/2015 00:01:43 Desktop name 'x11' (hipp3:201)
29/01/2015 00:01:43 Protocol versions supported: 3.7, 3.3
29/01/2015 00:01:43 RGB format 8 8 8
29/01/2015 00:01:43 Listening for VNC connections on TCP port 6101
[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/hudson850819625719855485.sh
+ metacity --replace --sm-disable
Xlib:  extension "RANDR" missing on display ":201.0".
Process leaked file descriptors. See http://wiki.hudson-ci.org/display/HUDSON/Spawning+processes+from+build for more information
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson5245789783435719152.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 90a555f] 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 18b452d] 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 9bd5a54] 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 d0424d0] 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 b05e071] 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 0b54459] 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.
Window manager warning: Fatal IO error 11 (Resource temporarily unavailable) on display ':201'.
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