cmpilato@red-bean.com writes:
> > Wow, sounds like we could have used branches here. :-)
>
> Yep, it sure does. In fact, I was going to do this. But with no
> merge at the time, I opted out of using them. :-(

Hmm, just a side note -- we can still use branches even before

$ svn merge

is working. Merging changes using `svn diff' is just doing by hand
what merge would have done automagically.