[Sugar-devel] sugar-build after osbuild change report

[Daniel Narvaez]

On 21 May 2013 10:15, Simon Schampijer <simon at schampijer.de> wrote:

>
> Pulling today I got:
>
> [erikos at t61 sugar-build]$ ./osbuild pull
>
>
> = Updating build system =
>
> * Pulling sugar-build
> Already up-to-date.
>
> = Pulling =
>
> * Pulling automake
> * Pulling glib
> * Pulling gobject-introspection
> * Pulling pygobject
> * Pulling dbus-python
>
> * Pulling libsoup
> * Pulling webkitgtk
>
> Command failed, tail of /home/erikos/sugar-build/**build/logs/pull-0.log
>
> Already up-to-date.
> From git://github.com/dnarvaez/**webkitgtk<http://github.com/dnarvaez/webkitgtk>
>    23a61f3..562e907  master     -> origin/master
> error: Your local changes to the following files would be overwritten by
> merge:
>         GNUmakefile.in
>         aclocal.m4
>         configure
> Please, commit your changes or stash them before you can merge.
> Aborting
> Updating 23a61f3..562e907
>
>
> I did not have made any changes in webkitgtk, I did a "git reset --hard
> origin" in the webkitgtk directory and now things work.
>

Yeah, that one is hard to fix... I tried to stash changes but that triggers
other issues. The easiest approach is probably to fix webkigtk to not
regenerate those files, but I haven't yet figured out how/when they are
written. I couldn't even reproduce it anymore here  after I added a
.gitignore.

So, I'll try to fix this up but until then people should "git reset --hard
origin" (hopefully I'm not going to update webkitgtk again before I solve
it, so it should only be needed one time).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130521/a746db22/attachment.html>