[
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 #148
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/148/>
------------------------------------------
Started by timer
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision 4e38d5e3d8cd991981daa18b9e25bb96bac5d9b3 (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 4e38d5e3d8cd991981daa18b9e25bb96bac5d9b3 (origin/master)
Checking out Revision 4e38d5e3d8cd991981daa18b9e25bb96bac5d9b3 (origin/master)
Starting xvnc
[workspace] $ Xvnc :87 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson7474601868522018712.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8178839612817557726.sh
08/03/2015 00:01:06 Xvnc version X.org/xf4vnc custom version
08/03/2015 00:01:06 Copyright (C) 2001-2004 Alan Hourihane.
08/03/2015 00:01:06 Copyright (C) 2000-2004 Constantin Kaplinsky
08/03/2015 00:01:06 Copyright (C) 1999 AT&T Laboratories Cambridge
08/03/2015 00:01:06 All Rights Reserved.
08/03/2015 00:01:06 See http://www.tightvnc.com/ for information on TightVNC
08/03/2015 00:01:06 See http://xf4vnc.sf.net for xf4vnc-specific information
08/03/2015 00:01:06 Desktop name 'x11' (hipp6:87)
08/03/2015 00:01:06 Protocol versions supported: 3.7, 3.3
08/03/2015 00:01:06 RGB format 8 8 8
08/03/2015 00:01:06 Listening for VNC connections on TCP port 5987
+ 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
[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/71/22671/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 4720961] 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 9fca29a] 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 93fb348] 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 9d66d5c] 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 7132183] 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/36642'
>> Cherry-picking https://git.eclipse.org/r/#/c/36642
+ git fetch /gitroot/egit/egit refs/changes/42/36642/2
>From /gitroot/egit/egit
* branch refs/changes/42/36642/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 3afab13] Fix random InterruptedException on merges
Author: Laurent Goubet <laurent.goubet@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/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 fa67b3c] 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'
+ true
+ sed '/>>>>>>> .*/d;s/version="3.7.0"/version="4.0.0"/g' org.eclipse.egit.core/META-INF/MANIFEST.MF
+ perl -pe 'BEGIN{undef $/;} s/<<<<<<<.*?=======\n//sm' sed.tmp
+ mv manifest.tmp org.eclipse.egit.core/META-INF/MANIFEST.MF
+ rm sed.tmp
+ sed '/>>>>>>> .*/d;s/version="\[3.7.0,3.8.0/version="\[4.0.0,4.1.0/g;s/version="3.7.0"/version="4.0.0"/g' org.eclipse.egit.ui/META-INF/MANIFEST.MF
+ perl -pe 'BEGIN{undef $/;} s/<<<<<<<.*?=======\n//sm' sed.tmp
+ mv manifest.tmp org.eclipse.egit.ui/META-INF/MANIFEST.MF
+ rm sed.tmp
+ git add org.eclipse.egit.core/META-INF/MANIFEST.MF org.eclipse.egit.ui/META-INF/MANIFEST.MF
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
error: 'commit' 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: Exiting because of an unresolved conflict.
U org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
Terminating xvnc.
Recording test results
Archiving artifacts
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/
