Maybe I should just bite the bullet and keep two active versions (like normal) ... one version is the currently released version - and only gets fixes ... the other version is the one i'm "working on" - and that becomes the next "minor" release, with all the fixes rolled into it.