On Tue, May 19, 2015 at 09:26:09PM +0200, Maren Hachmann wrote:
Hi all,
I don't know whose task it is now to keep Jenkins happy, but I noticed his desperate message on the tester mailing list - maybe someone would like to help him ;) ?
http://sourceforge.net/p/inkscape/mailman/message/34123279/ From: Jenkins (build tester) <inkscape.jenkins@...1410...> - 2015-05-18 20:05:05 Hi Developers, It looks like "bzr up" failed for Inkscape trunk. Please, someone have a look on jenkins.inkscape.org and restart the "Inkscape_trunk_bzr_up" job!
Started by an SCM change Building in workspace /var/lib/jenkins/sharedspace/inkscape_trunk $ bzr revision-info -d /var/lib/jenkins/sharedspace/inkscape_trunk info result: bzr revision-info -d /var/lib/jenkins/sharedspace/inkscape_trunk returned 0. Command output: "14162 tavmjong@...3242... " stderr: "" [inkscape_trunk] $ bzr clean-tree --quiet --ignored --unknown --detritus --force [inkscape_trunk] $ bzr update ... M src/widgets/swatch-selector.cpp M src/widgets/swatch-selector.h Text conflict in po/inkscape.pot 1 conflicts encountered. Updated to revision 14162 of branch http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk ERROR: Failed to bzr update
Bryce