It seems a more intuitive behavior would be to have a parent node containing children that have been modified but not activated to display the yellow or perhaps another color activation status indicator so that when viewing collapsed hierarchy with many nested levels you could quickly see if any edits had been made that hadn't yet been activated.