I found myself making major changes to all the SQL queries in the Subversion trunk, and then remembered I hadn't yet branched the current version! Oops!
With subversion, thankfully it wasn't a big deal. I tagged and branched phunkybb-0.02 from yesterday, so all is good. I'll keep maintaining that for bugs, but all new work will be done on the trunk. If 0.02 gets used by a bunch of people, I might copy over non-site_id improvements, but I'd rather focus on the future.