tinderbox xclock checkout failure
Gaetan Nadon
memsize at videotron.ca
Fri Nov 13 17:37:19 PST 2009
On Sat, 2009-11-14 at 00:47 +0100, Florian Mickler wrote:
> Hi,
> the xclock build fails currently with a checkout failure[1]:
>
> git checkout origin/master
> fatal: Untracked working tree file 'INSTALL' would be overwritten by
> merge.
>
>
> i don't know what git commands the tinderbox-script uses, but maybe
> one of :
> a) git clean -dqfx
> b) git checkout --force
>
> could help here...
>
Yes it could. The root problem is that the module configuration is an
inconsistent state. Other modules exhibit similar inconsistencies in the
area of the INSTALL file.
https://bugs.freedesktop.org/show_bug.cgi?id=24206.
I have designed and implemented a common solution for all 251 xorg
modules which is documented here:
http://wiki.x.org/wiki/NewModuleGuidelines. This solution is being
reviewed and awaiting approval.
Even when patches are released, tinderbox will still need to remove this
file for the checkout to be successful.
Thanks
Gaetan
>
> cheers,
> Flo
>
>
> [1]http://tinderbox.freedesktop.org/builds/2009-11-13-0030/logs/xclock/#checkout
> _______________________________________________
> xorg-devel mailing list
> xorg-devel at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.x.org/archives/xorg-devel/attachments/20091113/1901c0b5/attachment.html
More information about the xorg-devel
mailing list