Dear svn patch lovers, The patch submitted by Катаргин Алексей on dev@ today fails to apply to trunk with 'svn patch', but applies with unix patch.
I've attached a concatenated version of the patch to this mail (the original submission contained several diff files). $ svn patch -p2 /tmp/sasl.diff.txt C subversion/svnserve/cyrus_auth.c > rejected hunk @@ -46,6 +46,7 @@ > rejected hunk @@ -48,6 +48,7 @@ > rejected hunk @@ -115,14 +115,15 @@ > rejected hunk @@ -262,7 +262,7 @@ > rejected hunk @@ -2877,6 +2878,9 @@ > rejected hunk @@ -2943,6 +2947,7 @@ Summary of conflicts: Text conflicts: 1 Stefan
