In October 1941 the Anglo-Soviet discussion agreed that the post war world would possibly have an independent Bavaria and a sort of Prussia, that would act as a Polish puppet or maybe be annexed by Poland entirely. I'm not sure about beforehand though. I guess both were hoping that they wouldn't need to invade Germany and wait for the inevitable economic collapse, Stalin sort of pulled the rug from under them here, as did Von Manstein, but I guess they would have just reversed everything from 1936 onwards, a limited term of occupation, then a very closely watched democracy with perhaps a demilitarised border eastern border.