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

[hudsonbuild@xxxxxxxxxxx]

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

Changes:

[Robin Stocker] Don't show "Running Launch" dialog again after "Checkout Conflicts"

[Matthias Sohn] Optimize RevUtils.isContainedInAnyRef by not checking older refs

[Matthias Sohn] Remove files from src.includes which aren't required in source build

[Matthias Sohn] [historyView] Show date columns in local time zone, original on hover

[Matthias Sohn] [historyView] Show name and email on hover of author/committer column

[Matthias Sohn] [stagingView] Compare against HEAD for conflicting files

[Matthias Sohn] Revert "Show a rebase result dialog if cherry-picking fails."

[Stefan Lay] Revert "Add support for cherry-picking multiple commits at once"

[Matthias Sohn] [stagingView] Enhance IndexDiffData to support submodules

[Matthias Sohn] Decorate symlinks properly according to their git status

[Matthias Sohn] [stagingView] Don't forget amend state after repository refreshes

[Matthias Sohn] Add ProjectUtil.refreshRepositoryResources

[Matthias Sohn] Make DiscardChangesOperation work for non-resources

[Matthias Sohn] Support checking out stage with DiscardChangesOperation

[Matthias Sohn] [stagingView] Add "Replace With > Ours/Theirs" menu for conflicts

[Matthias Sohn] EGit v3.4.2.201412180340-r

[Matthias Sohn] EGit v3.5.3.201412180710-r

[Matthias Sohn] Use appropriate constructor to create bare repository

[Matthias Sohn] Search running launch configuration in ModalContext

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision c1dd5da064f17bc871c7454b9ca0e38c230d746e (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 793e8cc0607112e6eeac12bb6a3fc495f14f5b9b (origin/master)
Checking out Revision 793e8cc0607112e6eeac12bb6a3fc495f14f5b9b (origin/master)
Starting xvnc
[workspace] $ Xvnc :277 -geometry 1024x768 -depth 24 -ac
23/12/2014 00:04:43 Xvnc version X.org/xf4vnc custom version
23/12/2014 00:04:43 Copyright (C) 2001-2004 Alan Hourihane.
23/12/2014 00:04:43 Copyright (C) 2000-2004 Constantin Kaplinsky
23/12/2014 00:04:43 Copyright (C) 1999 AT&T Laboratories Cambridge
23/12/2014 00:04:43 All Rights Reserved.
23/12/2014 00:04:43 See http://www.tightvnc.com/ for information on TightVNC
23/12/2014 00:04:43 See http://xf4vnc.sf.net for xf4vnc-specific information
23/12/2014 00:04:43 Desktop name 'x11' (hipp3:277)
23/12/2014 00:04:43 Protocol versions supported: 3.7, 3.3
23/12/2014 00:04:43 RGB format 8 8 8
23/12/2014 00:04:43 Listening for VNC connections on TCP port 6177
[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/hudson761639578330150790.sh
+ metacity --replace --sm-disable
Xlib:  extension "RANDR" missing on display ":277.0".
[workspace] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson1001931726936497736.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/22670'
>> Cherry-picking https://git.eclipse.org/r/#/c/22670
+ git fetch /gitroot/egit/egit refs/changes/70/22670/7
>From /gitroot/egit/egit
 * branch            refs/changes/70/22670/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 7b8a14a] Prevent exception propagation when auto-staging moves or deletions.
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/FileDeleteHookTest.java
+ 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/8
>From /gitroot/egit/egit
 * branch            refs/changes/71/22671/8 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 339efdb... Introduce internal API to integrate Team merging
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.
Archiving artifacts
Recording test results

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/