You could have some kind of status/generation column, that's set to one value for editing, and another for displaying. Thus you get all the rows together in one grand unified table, but the normal display routines ask for only those rows with 'generation = 0' or some other similar scheme.