cauld - BINGO!  Alright folks I finally have it.  I reversed the 30 to 38 committed revisions, fixed the tinymce directory, and was able to merge revisions 30 to 95 successfully.  Now 4.6 reflects all 453h changes.  Lesson learned.. be very careful when deleting a directory and adding in the same directory with a different structure underneath.