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

Re: TortoiseSVN Diff/Patch creates files with mixed Unix and Win32 line endings when creating patch from pure unix files.

From: demerphq <demerphq_at_gmail.com>
Date: 2006-11-20 20:04:05 CET

On 11/20/06, Stefan Küng <tortoisesvn@gmail.com> wrote:
> demerphq wrote:
> > Hi,
> >
> > I've discovered that when producing a unified diff of a file with unix
> > line endings using Tortoise SVN produces files with mixed Win32/Unix
> > line endings. The diff headers have Win32 line endings but the rest
> > does not. This makes many unix patch(1) programs unhappy and renders
> > the patch inexplicably unappliable and apparently corrupt. Running
> > dos2unix on the file first removes the spurious win32 line endings.
>
> Actually, it's Subversion that creates the patch. You get the same
> result if you use the official Subversion command line client and do an:
> svn diff . > patchfile.diff

Ah, ok. I had a feeling it might be, but wasnt sure.

Ill report this as a bug to the svn folks.

> To avoid such problems:
> set the svn:eol-style property to whatever you need. I'd recommend 'native'.

Im not familiar with this, but I will look into it, thanks.

Thanks for the reply, and sorry for the noise.
Yves

-- 
perl -Mre=debug -e "/just|another|perl|hacker/"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Nov 20 21:23:48 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.