[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn patch fails on this diff

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 3 Mar 2010 15:52:59 +0100

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
Received on 2010-03-03 15:53:37 CET

This is an archived mail posted to the Subversion Dev mailing list.