Branches actually make this much less painful. Just reverse merge from the trunk back to each branch on a frequent basis.