Correctly update the tracking diff with the patches from trunk