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

Re: Patch files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 03 Nov 2011 17:49:23 +0100

On 03.11.2011 17:18, Jens Geyer wrote:
>>> I stumbled about the interesting fact, that .patch files created
>>> with (T)SVN are sometimes rejected by the patch command on *nix
>>> platforms. And somewhere else I found a comment to the effect,
>>> that this is a known behavior for a long time and the workaround
>>> is to use diff instead of (T)SVN.
>>>
>> Rumors, or a fact that you observed by yourself?
>
> Observed. Patch files created with TSVN on Windows applied on an
> Ubuntu machine with "patch" failed with "hunk X failed at Y"
> repeatedly. The same patch, but created with a "diff" utility other
> than (T)SVN succeeded.
>
>> If you need specific answer or change in Tortoise, you need to
>> mention specific problem.
>
> I can provide an example, if that is what you mean by "specific".
>
>> Note that there is new "svn patch" command in Subversion 1.7. I
>> think it can help you when other patch utilities fail.
>
> What if SVN seems to be the failing utility here?

It may be that the problem you're seeing is because of the different
EOLs used on Windows and Linux. Especially if you've also set the
svn:eol-style to 'native'.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2872475
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-03 17:49:37 CET

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