John Arbash Meinel has voted tweak. Status is now: Conditionally approved Comment: After our discussions, I think Aaron had a decent plan for how to continue, and 'bzr merge --preview' is fine for exposing it. For details, see: http://bundlebuggy.aaronbentley.com/request/%3C4775E640.4040900%40aaronbentley.com%3E