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

Re: Possible BUG with patch creation in newline style

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 17 Jul 2008 17:41:03 +0200

Emmanuel Stapf [ES] wrote:
> Until version 1.5, when TortoiseSVN was creating a patch, the patch
> file was using Windows end-of-line (i.e. \r\n) for every line of the
> patch. So moving the patch file to unix, only consisted of converting
> the file to the Unix end-of-line.
>
> In version 1.5, the patch file is using a mixture of both \r\n and \n.
> It uses \r\n for the patch context, i.e:
>
> Index: eiffel/interface/class_c.e
> ===================================================================
> --- eiffel/interface/class_c.e (revision 74090)
> +++ eiffel/interface/class_c.e (working copy)
>
> and \n for the patch content.
>
> So now when moving a patch to unix, you still have to do something,
> i.e. removing the \r.
>
> I'm not sure why this was changed, but I would kindly request that it
> only uses \n as it will make my life easier to move patches from one
> platform to the other.

The file context uses the platform EOLs. The actual file content uses
the EOLs of the file itself. That's expected and actually wanted,
otherwise the patch would not contain EOL changes.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-17 17:41:28 CEST

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