rework branch handling so that the old decisions are still available

This allows us to auto-minimize packages that got supplemented
later on.
add '-m' option to test the solution callback