Because we don't care about changes to the admin panel, this shouldn't be too hard: Need to merge all changes to Bouncer that happened on the production branch only into the trunk. For sentry, I'll just import the production code.
I took the php trunk (everything except admin), cherry-picked the few changes made on the production branch, and just checked in sentry and sentryviewer straight from the prod branch. I don't plan on repeatedly doing that, so if there are any other changes to the non-admin part of bouncer before tuxedo is deployed, feel free to hand me a patch if you want it to go into trunk. http://github.com/fwenzel/tuxedo/commits/