Friday, June 15, 2007

Merge and Goto Sadness

Almost two months ago I went off on my own branch of the source tree to make some restructuring and refactorings. Wednesday I finally finished my changes (or, got them close enough to begin bringing them back into the trunk) and am now in the process of merging. I found a pretty sweet tool for performing individual file merges named Guiffy. It's a $75 tool, but is free for 21 days (which should be more than enough time for my process). The critical feature it provides is character-by-character diffs. Given some of the changes I've made, this is huge. It also seems to be pretty good about correlating changes that effect line numbers. It's not perfect, but certainly good enough.

While merging, I came upon a statement that made me really, really sad. C# supports goto statements?!?!? I thought that goto had been recognized long ago as a bad idea. What gives?