diff and revision