Your comments

Another option could be to have a menu entry to make the disk content exactly like the referenced branch. The Local->Reset options don't seem to do this :(