I would also caution you against using cherry-picking for selectively releasing features while holding other features out of the release.
I blogged on this challenge a while back: http://blogs.msdn.com/b/billheys/archive/2011/01/19/branching-sprint-is-done-some-features-are-not.aspx
http://blogs.msdn.com/b/billheys/archive/2011/01/19/what-is-a-cherry-pick-merge-and-why-do-you-recommend-against-them.aspx
