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

Re: AW: Patch files

From: Konstantin Kolinko <knst.kolinko_at_gmail.com>
Date: Thu, 3 Nov 2011 22:32:59 +0400

2011/11/3 Stefan Küng <tortoisesvn_at_gmail.com>:
> On 03.11.2011 18:31, Jens Geyer wrote:
>> I just found this one:
>> http://svn.apache.org/repos/asf/subversion/branches/fs-successor-ids/notes/s
>> vnpatch/svnpatch.txt
>>
>> Could it be that the SVN patch format is not really intended to be
>> compatible with diff/patch?
>> In other words, performing
>>
>>       patch -p0 .<  my.patch
>>
>> using an SVN-created patch file *is* the problem?
>
> As far as I know, it should be compatible.
> Maybe you should report this on the Subversion mailing list?
>

The patch is correct but the *nix patch utility cannot apply it
because it does not match the file that it tries to patch. It does not
know that it should ignore the line ends, nor anything about
svn:eol-style property. It might be that there are command line
options though.

There is official "svn patch" command now. I do not know whether "svn
patch" will apply the patch as is, but if it does not you may ask on
their users@ list.

There is "--ignore-whitespace" option but it does a bit more than just
ignoring end lines.

You can always pipe the patch through dos2unix utility or "tr '\r'" to
convert the line ends to match the *nix file.

Best regards,
Konstantin Kolinko

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2872500

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-03 19:33:02 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.