<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0"> </HEAD> <BODY> On Sat, 2009-11-14 at 00:47 +0100, Florian Mickler wrote: <BLOCKQUOTE TYPE=CITE> <PRE> 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... </PRE> </BLOCKQUOTE> 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. <A HREF="https://bugs.freedesktop.org/show_bug.cgi?id=24206.">https://bugs.freedesktop.org/show_bug.cgi?id=24206.</A> I have designed and implemented a common solution for all 251 xorg modules which is documented here: <A HREF="http://wiki.x.org/wiki/NewModuleGuidelines.">http://wiki.x.org/wiki/NewModuleGuidelines.</A> 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 <BLOCKQUOTE TYPE=CITE> <PRE> cheers, Flo [1]<A HREF="http://tinderbox.freedesktop.org/builds/2009-11-13-0030/logs/xclock/#checkout">http://tinderbox.freedesktop.org/builds/2009-11-13-0030/logs/xclock/#checkout</A> _______________________________________________ xorg-devel mailing list <A HREF="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</A> <A HREF="http://lists.x.org/mailman/listinfo/xorg-devel">http://lists.x.org/mailman/listinfo/xorg-devel</A> </PRE> </BLOCKQUOTE> </BODY> </HTML>