oops, be consistent about patch application in checked out tree