MarmotBlog

Branches, directories and a lesson in merging

tepeds — Wed, 24 Mar 2004 12:17:43 +0000

Tim pointed out to me today that the last merge from the 1.2 branch to the trunk did not include John's cool Marmot theme. John added and committed the theme on the branch, not the trunk, so I assumed it would be merged. Whether this is a failing CVS or that I'm using and old [...]

The start of 1.3

tepeds — Thu, 18 Mar 2004 16:28:35 +0000

Marmot 1.2.1 has now been tagged and all bug fixes and enhancements to the release have been merged back to the trunk. The development cycle for 1.3 can start now. Any additional bug fixes, etc. to the 1.2 branch will be merged back as necessary. Make sure to checkout or update to the trunk [...]

Dealing with vendor distributions

tepeds — Wed, 17 Mar 2004 22:37:31 +0000

This happened with UBB and has come up again as I start working on a email class. It is obviously just short of suicidal to try and recreate every wheel, so we start with existing classes. But how do we include those in Marmot? I don't think that cluttering the libraries/mu directory with other [...]

Little stuff

tim — Wed, 17 Mar 2004 14:04:34 +0000

First off, all of the Marmot pages except CVS Monitor should have John's new Marmot favicon. Safari seems to lose the icon when you switch tabs, so it's not as cool as it could be. And it looks like IE doesn't like it either. Oh, well. Also, CVS Monitor has been updated to the final release [...]

Marmot 1.2 branched

tepeds — Fri, 05 Mar 2004 14:08:02 +0000

The Marmot 1.2 branch has been created in the CVS repository. John and I finished some last minute tweaks today in Tim's absence, but we believe we would have had his support for the changes eventually. :) Time to update to the branch on our development machines and see what bugs make themselves known. cvs update [...]

CVS quirks

tim — Wed, 03 Mar 2004 13:51:37 +0000

Just as a reminder, the cvs that comes with Xcode Tools is an old version (1.10, 1998) that doesn't support useful features like update -C. DarwinPorts has 1.11.13, and Fink has 1.11.5-1. I'm still intrigued by arch, maybe I'll give it a try sometime...

Get your kicks, on Bug 105

tim — Wed, 03 Mar 2004 13:31:00 +0000

Bug 105 started with two similar problems John and Tim had with making its way into their applications, in and out of a database, and back out to the presentation layer, either causing an XML parsing error or a very mangled output stream. The root of the problem was Marmot's questionably-intelligent encoding practices. In 1.0.x, [...]

Database documentation

tepeds — Wed, 25 Feb 2004 21:22:06 +0000

I just noticed that the database class documentation is well underway, but the chapter on datasources and databases is really lacking. We need to spend some time on this before we can finalize 1.1. We're billing this as reference release, after all.

Ch-ch-ch-changes

tim — Fri, 20 Feb 2004 17:11:34 +0000

First off, the Blog, Bugzilla, and official Documentation are now all on naslnx05. naslnx07 will redirect for a while, but I'll probably clean that junk off in the next week or two. Secondly, we're going to try to have a much bigger focus on Bugzilla. Previously, it was just a way for Dirk to have a [...]

Things to discuss

tim — Wed, 18 Feb 2004 14:45:47 +0000

Anything we feel we need to discuss before the roll-out of 1.2