[emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-

[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 #163
From: hudsonbuild@xxxxxxxxxxx
Date: Wed, 11 Mar 2015 12:26:53 -0400 (EDT)
Delivered-to: emfcompare-build@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/emfcompare-build>
List-help: <mailto:emfcompare-build-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/emfcompare-build>, <mailto:emfcompare-build-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/emfcompare-build>, <mailto:emfcompare-build-request@eclipse.org?subject=unsubscribe>
See <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/163/>

------------------------------------------
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 1c2d78e0cacd9b2efd516daa8774b1c43ffeea71 (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 1c2d78e0cacd9b2efd516daa8774b1c43ffeea71 (origin/master)
Checking out Revision 1c2d78e0cacd9b2efd516daa8774b1c43ffeea71 (origin/master)
Starting xvnc
[workspace] $ Xvnc :253 -geometry 1024x768 -depth 24 -ac
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson8541569728182173203.sh
+ metacity --replace --sm-disable
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson7874547043711870084.sh
11/03/2015 12:26:43 Xvnc version X.org/xf4vnc custom version
11/03/2015 12:26:43 Copyright (C) 2001-2004 Alan Hourihane.
11/03/2015 12:26:43 Copyright (C) 2000-2004 Constantin Kaplinsky
11/03/2015 12:26:43 Copyright (C) 1999 AT&T Laboratories Cambridge
11/03/2015 12:26:43 All Rights Reserved.
11/03/2015 12:26:43 See http://www.tightvnc.com/ for information on TightVNC
11/03/2015 12:26:43 See http://xf4vnc.sf.net for xf4vnc-specific information
11/03/2015 12:26:43 Desktop name 'x11' (hipp6:253)
11/03/2015 12:26:43 Protocol versions supported: 3.7, 3.3
11/03/2015 12:26:43 RGB format 8 8 8
11/03/2015 12:26:43 Listening for VNC connections on TCP port 6153
+ 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/10
[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/10 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 618b94e] Introduce internal API to integrate Team merging
 Author: Axel Richard <axel.richard@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 9e172e0] 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/11
>From /gitroot/egit/egit
 * branch            refs/changes/74/22674/11 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 84bb3bb] 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/4
>From /gitroot/egit/egit
 * branch            refs/changes/48/25948/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 841068a] 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 7a9233f] 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 58bf047] 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/6
>From /gitroot/egit/egit
 * branch            refs/changes/58/34458/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 1df086b... 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 eca4b2a] Comparison with refs should allow merging when local data is used
 Author: Axel Richard <axel.richard@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/13
>From /gitroot/egit/egit
 * branch            refs/changes/72/22672/13 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 7ea95bf] Let the ModelProviders compare their own file formats.
 Author: Axel Richard <axel.richard@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/8
>From /gitroot/egit/egit
 * branch            refs/changes/51/22851/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD dea540d] 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/30190'
>> Cherry-picking https://git.eclipse.org/r/#/c/30190
+ git fetch /gitroot/egit/egit refs/changes/90/30190/7
>From /gitroot/egit/egit
 * branch            refs/changes/90/30190/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 76edfb2... Extract convenience methods in a separate class from the tests
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
+ perl -pe 'BEGIN{undef $/;} s/<<<<<<<.*?>>>>>>>.*?\n//sm' org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+ mv perl.tmp org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+ git add org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitSubscriberMergeContextTest.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD 8cc0a76] 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 9df7ad6] 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 a0590f6] 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/8
>From /gitroot/egit/egit
 * branch            refs/changes/26/36026/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 2f79c44] Provide access to the absolute path of the git storages
 Author: Axel Richard <axel.richard@xxxxxxx>
 4 files changed, 73 insertions(+), 29 deletions(-)
 rename org.eclipse.egit.core.test/src/org/eclipse/egit/core/{internal/storage/BlobStorageTest.java => storage/GitBlobStorageTest.java} (87%)
 rename org.eclipse.egit.core/src/org/eclipse/egit/core/{internal/storage/BlobStorage.java => storage/GitBlobStorage.java} (68%)
+ sed s/BlobStorage/org.eclipse.egit.core.storage.GitBlobStorage/g org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ mv sed.tmp org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ git add org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/TreeParserResourceVariant.java
+ git commit --ammend
error: unknown option `ammend'
usage: git commit [options] [--] <pathspec>...

    -q, --quiet           suppress summary after successful commit
    -v, --verbose         show diff in commit message template

Commit message options
    -F, --file <file>     read message from file
    --author <author>     override author for commit
    --date <date>         override date for commit
    -m, --message <message>
                          commit message
    -c, --reedit-message <commit>
                          reuse and edit message from specified commit
    -C, --reuse-message <commit>
                          reuse message from specified commit
    --fixup <commit>      use autosquash formatted message to fixup specified commit
    --squash <commit>     use autosquash formatted message to squash specified commit
    --reset-author        the commit is authored by me now (used with -C/-c/--amend)
    -s, --signoff         add Signed-off-by:
    -t, --template <file>
                          use specified template file
    -e, --edit            force edit of commit
    --cleanup <default>   how to strip spaces and #comments from message
    --status              include status in commit message template
    -S, --gpg-sign[=<key id>]
                          GPG sign commit

Commit contents options
    -a, --all             commit all changed files
    -i, --include         add specified files to index for commit
    --interactive         interactively add files
    -p, --patch           interactively add changes
    -o, --only            commit only specified files
    -n, --no-verify       bypass pre-commit hook
    --dry-run             show what would be committed
    --short               show status concisely
    --branch              show branch information
    --porcelain           machine-readable output
    --long                show status in long format (default)
    -z, --null            terminate entries with NUL
    --amend               amend previous commit
    --no-post-rewrite     bypass post-rewrite hook
    -u, --untracked-files[=<mode>]
                          show untracked files, optional modes: all, normal, no. (Default: all)

Terminating xvnc.
Recording test results
Archiving artifacts

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/
Follow-Ups:
- [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #164
  - From: hudsonbuild
References:
- [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #162
  - From: hudsonbuild
Prev by Date: [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #162
Next by Date: [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #164
Previous by thread: [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #162
Next by thread: [emfcompare-build] [Hudson] Build failed in Hudson: egit.logical-master-nightly #164
Index(es):
- Date
- Thread
Breadcrumbs
