As Rob also pointed out … the new-ish Reintegrate Merge in SVN really makes that previously complicated step, rather simple.