Even worse, I've been known to cherry-pick commits from different unstable branches to get a semblance of "what I need".

It's not pretty, but we do what we need to do.