[
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 #101
|
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/101/>
------------------------------------------
Started by user laurent.goubet@xxxxxxx
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision 24dc0428d32195b0223d90184334314e41506e03 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/egit/egit.git
Commencing build of Revision 24dc0428d32195b0223d90184334314e41506e03 (origin/master)
Checking out Revision 24dc0428d32195b0223d90184334314e41506e03 (origin/master)
Starting xvnc
[workspace] $ Xvnc :867 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson7727674322643904211.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson6984679974014893796.sh
13/01/2015 05:46:40 Xvnc version X.org/xf4vnc custom version
13/01/2015 05:46:40 Copyright (C) 2001-2004 Alan Hourihane.
13/01/2015 05:46:40 Copyright (C) 2000-2004 Constantin Kaplinsky
13/01/2015 05:46:40 Copyright (C) 1999 AT&T Laboratories Cambridge
13/01/2015 05:46:40 All Rights Reserved.
13/01/2015 05:46:40 See http://www.tightvnc.com/ for information on TightVNC
13/01/2015 05:46:40 See http://xf4vnc.sf.net for xf4vnc-specific information
13/01/2015 05:46:40 Desktop name 'x11' (hipp3:867)
13/01/2015 05:46:40 Protocol versions supported: 3.7, 3.3
13/01/2015 05:46:40 RGB format 8 8 8
13/01/2015 05:46:40 Listening for VNC connections on TCP port 6767
+ 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/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)
>From /gitroot/egit/egit
* branch refs/changes/71/22671/9 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2069b72] 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 ff16c21] 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 142196b] 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 c31c5b1] 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 9637388] 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 e2dbd30] 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/11
>From /gitroot/egit/egit
* branch refs/changes/72/22672/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 56f945d] Let the ModelProviders compare their own file formats.
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
6 files changed, 466 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/7
>From /gitroot/egit/egit
* branch refs/changes/51/22851/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD ed325e1] 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/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 aec1c29] 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/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 152b156] 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/30190'
>> Cherry-picking https://git.eclipse.org/r/#/c/30190
+ git fetch /gitroot/egit/egit refs/changes/90/30190/6
>From /gitroot/egit/egit
* branch refs/changes/90/30190/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 20e0873] Extract convenience methods in a separate class from the tests
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
9 files changed, 429 insertions(+), 285 deletions(-)
create mode 100644 org.eclipse.egit.core.test/fragment.xml
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelAdapterFactory.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleModelProvider.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleResourceMapping.java
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/SampleResourceMappingMerger.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/34574'
>> Cherry-picking https://git.eclipse.org/r/#/c/34574
+ git fetch /gitroot/egit/egit refs/changes/74/34574/2
>From /gitroot/egit/egit
* branch refs/changes/74/34574/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 148c92c] GitSubscriberMergeContextTest was failing on windows
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
1 file changed, 15 insertions(+), 12 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/30191'
>> Cherry-picking https://git.eclipse.org/r/#/c/30191
+ git fetch /gitroot/egit/egit refs/changes/91/30191/5
>From /gitroot/egit/egit
* branch refs/changes/91/30191/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD c64824c] Introduce tests for the logical merging
Author: Laurent Goubet <laurent.goubet@xxxxxxx>
2 files changed, 984 insertions(+), 12 deletions(-)
create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/StrategyRecursiveModelTest.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36026'
>> Cherry-picking https://git.eclipse.org/r/#/c/36026
+ git fetch /gitroot/egit/egit refs/changes/26/36026/5
>From /gitroot/egit/egit
* branch refs/changes/26/36026/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 84de447... Provide access to the absolute path of the git storages
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.*\|>>>>>>>.*\|=======/d' org.eclipse.egit.core/src/org/eclipse/egit/core/storage/GitBlobStorage.java
+ perl -pi.bak -e 's|(?<!Git)BlobStorage(?!_\|[A-Za-z])|GitBlobStorage|g' sed.tmp
+ mv sed.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/storage/GitBlobStorage.java
+ rm sed.tmp.bak
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/storage/GitBlobStorage.java
+ 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.core/META-INF/MANIFEST.MF
Terminating xvnc.
Archiving artifacts
Recording test results
--
This message is automatically generated by Hudson.
For more information on Hudson, see: http://hudson-ci.org/