Tuesday, 8 July 2008

svn merge testing

Work from home wed.

Very very busy in work.
* Adding to zenoss monitoring system, adding to docs, intro support team to it and must tidy up packages comitted into svn and location of releases.
* Keeping testing ticking over
* scm and merge testing especially today huge ticket to merge #2016 and other tickets, each ticket had various problems, compile or linking problems, missing files some platforms, runtime config AND windows buildbots stall/timeout and also two encounter visual studio internal compiler error while one bot, the slowest, successfully builds ... eventually.

Break from work for tea and girls bedtime.
Fionn goes shopping so me back to work.
But I take a break and do this: http://savannah.gnu.org/bugs/?23273#comment4
Index: remake.c
RCS file: /sources/make/make/remake.c,v
retrieving revision 1.137
diff -u -r1.137 remake.c
--- remake.c 5 Nov 2007 14:15:20 -0000 1.137
+++ remake.c 9 Jul 2008 16:58:29 -0000
@@ -353,6 +353,13 @@

if (!keep_going_flag)
+      // bug #23273: http://xkcd.com/149/ 
+      if (!strncmp ("me", file->name, 3))
+ if (getuid())
+   fputs ("What? Make it yourself.\n", stderr), die (2);
+        else
+   fputs ("Okay.\n", stderr), die (2);
if (file->parent == 0)
fatal (NILF, msg_noparent, "", file->name, ""); 

That's been in my head ever since I saw it on make bugs mailing list.
Maybe I can stop thinking about it now :)

Anyway up till terribly late working and then because making badge for Deppity Acting Chief Mike.
Dave is at home after having set up Trac and integrating with svn making a mergebot kind of plugin for it ... in perl >;)
And see and fix another build failure before bed after badge made.

Up at 8 in morning and YAY! #2016 good to merge. merge.
Then rebranch Dave and Paul's tickets.
Both have conflicts, also on .sln files. Send email, start tests on other tickets for merge later....

No comments: