https://bz.apache.org/ooo/show_bug.cgi?id=126893
--- Comment #2 from Don Lewis <[email protected]> --- Hmn ... svn patch chokes pretty badly on this patch, but the FreeBSD patch command likes it. I see this comment in "svn help patch" Hint: If the patch file was created with Subversion, it will contain the number of a revision N the patch will cleanly apply to (look for lines like '--- foo/bar.txt (revision N)'). To avoid rejects, first update to the revision N using 'svn update -r N', apply the patch, and then update back to the HEAD revision. This way, conflicts can be resolved interactively. -- You are receiving this mail because: You are the assignee for the issue.
