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

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/15/changes>

Changes:

[Axel Richard] [442898] Add conflict: content merge viewer displays wrong data

[Axel Richard] [453432] Add first use bug to the known limitations of CLI's doc.

[Laurent Goubet] Match performance when using only identifiers

[Axel Richard] [UI Tests] Update pom.xml & createAUT.sh

[Mikael Barbero] Register proxies as we load the xml instead of iterating afterwards

[Mikael Barbero] [UI Tests] Fix NoClassDefFound: org/sonatype/aether/RepositorySystem

[Axel Richard] Update q7 tests

[Laurent Goubet] Reduce the number of loops from difference group creation

[Laurent Goubet] Null out our undo/redo actions (reference to domain)

[Laurent Goubet] Dispose of the content viewers

[Axel Richard] [UI Tests] Revert upgrades

[Axel Richard] Remove useless comparison field

[Mikael Barbero] Style - properly use the google Predicate

[Axel Richard] Don't keep the empty group provider around

[Axel Richard] _all_ listeners are interested in _all_ fetching notifications

[Axel Richard] Style - false is the default value for booleans

[Axel Richard] Cleanup compare configuration

[Mikael Barbero] Launch resolution of cross-resource proxies as soon as they're detected

[Mikael Barbero] [437574] Properly dispose of the editing domains we create

[Mikael Barbero] [450360] Warning for duplicate IDs

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 15
Checkout:mars / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Using strategy: Default
Last Built Revision: Revision 01ae0763a8e0156dabc6bcdd1bcef170f1782099 (origin/master)
Checkout:mars / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/ws/> - hudson.remoting.LocalChannel@2a8bc1b8
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision 537aab5b43ec5165409892d0c0a24e07182e3c17 (origin/master)
Checking out Revision 537aab5b43ec5165409892d0c0a24e07182e3c17 (origin/master)
Starting xvnc
[mars] $ Xvnc :311 -geometry 1024x768 -depth 24 -ac
[mars] $ /bin/sh -xe /tmp/genie.modeling.emfcompare/hudson1948993351981441951.sh
+ sed -i.bak s#http://download.eclipse.org/egit/updates#https://hudson.eclipse.org/emfcompare/job/egit.logical-master-nightly/lastSuccessfulBuild/artifact/org.eclipse.egit.repository/target/repository/#g <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=mars/ws/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target>
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36025'
>> Cherry-picking https://git.eclipse.org/r/#/c/36025
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/25/36025/4
10/12/2014 02:01:53 Xvnc version X.org/xf4vnc custom version
10/12/2014 02:01:53 Copyright (C) 2001-2004 Alan Hourihane.
10/12/2014 02:01:53 Copyright (C) 2000-2004 Constantin Kaplinsky
10/12/2014 02:01:53 Copyright (C) 1999 AT&T Laboratories Cambridge
10/12/2014 02:01:53 All Rights Reserved.
10/12/2014 02:01:53 See http://www.tightvnc.com/ for information on TightVNC
10/12/2014 02:01:53 See http://xf4vnc.sf.net for xf4vnc-specific information
10/12/2014 02:01:53 Desktop name 'x11' (hipp3:311)
10/12/2014 02:01:53 Protocol versions supported: 3.7, 3.3
10/12/2014 02:01:53 RGB format 8 8 8
10/12/2014 02:01:53 Listening for VNC connections on TCP port 6211
[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/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/25/36025/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD a16b8be] Introduce git-specific support to fix unuseable storage paths
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 34 files changed, 1204 insertions(+), 211 deletions(-)
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/.project
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/about.html
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/build.properties
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/copyright.txt
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/epl-v10.html
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/feature.properties
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/feature.xml
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/modeling32.png
 create mode 100644 packaging/org.eclipse.emf.compare.egit-feature/pom.xml
 create mode 100644 plugins/org.eclipse.emf.compare.egit/.checkstyle
 create mode 100644 plugins/org.eclipse.emf.compare.egit/.classpath
 create mode 100644 plugins/org.eclipse.emf.compare.egit/.project
 create mode 100644 plugins/org.eclipse.emf.compare.egit/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 plugins/org.eclipse.emf.compare.egit/.settings/org.eclipse.jdt.ui.prefs
 create mode 100644 plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
 create mode 100644 plugins/org.eclipse.emf.compare.egit/about.html
 create mode 100644 plugins/org.eclipse.emf.compare.egit/build.properties
 create mode 100644 plugins/org.eclipse.emf.compare.egit/plugin.properties
 create mode 100644 plugins/org.eclipse.emf.compare.egit/plugin.xml
 create mode 100644 plugins/org.eclipse.emf.compare.egit/pom.xml
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/BlobStoragePathProvider.java
 create mode 100644 plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/EGitAdapterFactory.java
 rewrite plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ResourceVariantStorageProvider.java (65%)
 create mode 100644 plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/IStoragePathProvider.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35541'
>> Cherry-picking https://git.eclipse.org/r/#/c/35541
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/41/35541/4
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/41/35541/4 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD b26c1fb] Merge tool doesn't work on logical models
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 5 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFSynchronizationCompareAdapter.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/36847'
>> Cherry-picking https://git.eclipse.org/r/#/c/36847
+ git fetch /gitroot/emfcompare/org.eclipse.emf.compare refs/changes/47/36847/2
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/47/36847/2 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply d5e9b80... DRAFT - display proper labels for the content merge viewer panes
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/