patch does not apply to trunk of repository