[Rock-dev] Mars

[Sylvain Joyeux]

On 10/14/2011 09:24 AM, Lorenz Quack wrote:
> Hey,
>
> I may be mistaken but from the jenkins build log I take it that you modified your working copy of mars_core and therefore the update fails.
>
>  From the buildlog:
> updating simulation/orogen/mars_core
> Build failed: the local branch 'master' and the remote branch master of simulation/orogen/mars_core have diverged, and I therefore refuse to update automatically. Go into /home/build/jenkins/workspace/RockDFKIIncremental/FLAVOR/master/label/DebianUnstable/dev/simulation/orogen/mars_core and either reset the local branch or merge the remote changes: Autobuild::PackageException
This looks like somebody doing a force-push on the mars master branch. 
Bad idea.

Sylvain