[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=juno/56/changes>

Changes:

[Laurent Delaigue] Happy boy-scout: Fixed findbugs warning.

[Axel RICHARD] Add nominal split git uml models to performances tests

[Axel RICHARD] Improves git performances tests

[Axel RICHARD] Add large split git uml models to performances tests

[Laurent Delaigue] [458544] Impossible to save value of text att if left not editable.

[Laurent Goubet] [458502] NPE in EMFCompareStructureMergeViewer.

[Laurent Delaigue] [457034] ProximityEObjectMatcher should support cancellation

[Axel RICHARD] Update Q7 AUT for Mars M5

[Laurent Goubet] [459131] Fix Logical Model Resources Graph update

[Laurent Goubet] [413038] Fix Properties View: edit a value changes selection

[Laurent Goubet] [456796] Cascading filter shouldn't hide move differences

[Laurent Goubet] [436050] Fix copy all does nothing

[Laurent Goubet] Change feature names to more descriptive ones

[Axel RICHARD] [UI] Update q7 tests

[Axel RICHARD] [458802] NPE when IComparisonScope computes empty comparison.

[Laurent Goubet] Provide coherent names for the SDK features

[Axel RICHARD] [UI Tests] Update q7 tests config

[Laurent Goubet] [452147] Fix handling of diffs for interlocked one-to-one refs

[Axel RICHARD] [458818] NPE when conflict on multi-valued attrib. (move vs delete)

------------------------------------------
Started by upstream job "master-build-on-egit-logical-nighlty" build number 56
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@7fc348e6
Using strategy: Default
Last Built Revision: Revision e2f2d7f7f555f807c483aa92a86b4b20bef466af (origin/master)
Checkout:juno / <https://hudson.eclipse.org/emfcompare/job/master-build-on-egit-logical-nighlty/./PLATFORM=juno/ws/> - hudson.remoting.LocalChannel@7fc348e6
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/emfcompare/org.eclipse.emf.compare.git
Commencing build of Revision bd36b76f01bc32430bff925e5ca1fb2525a15af6 (origin/master)
Checking out Revision bd36b76f01bc32430bff925e5ca1fb2525a15af6 (origin/master)
Starting xvnc
[juno] $ Xvnc :154 -geometry 1024x768 -depth 24 -ac
[juno] $ /bin/sh -xe /tmp/genie.emfcompare/hudson6156534186947957668.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=juno/ws/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target>
27/02/2015 08:53:02 Xvnc version X.org/xf4vnc custom version
27/02/2015 08:53:02 Copyright (C) 2001-2004 Alan Hourihane.
27/02/2015 08:53:02 Copyright (C) 2000-2004 Constantin Kaplinsky
27/02/2015 08:53:02 Copyright (C) 1999 AT&T Laboratories Cambridge
27/02/2015 08:53:02 All Rights Reserved.
27/02/2015 08:53:02 See http://www.tightvnc.com/ for information on TightVNC
27/02/2015 08:53:02 See http://xf4vnc.sf.net for xf4vnc-specific information
27/02/2015 08:53:02 Desktop name 'x11' (hipp6:154)
27/02/2015 08:53:02 Protocol versions supported: 3.7, 3.3
+ 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/7
27/02/2015 08:53:02 RGB format 8 8 8
27/02/2015 08:53:02 Listening for VNC connections on TCP port 6054
[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/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/25/36025/7 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 9a198f6] 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/6
>From /gitroot/emfcompare/org.eclipse.emf.compare
 * branch            refs/changes/41/35541/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 85eb064... Merge tool doesn't work on logical models
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/