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

Re: Bug Report - Failure to parse unified diff when mixed eol markers are present

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-05-16 20:56:03 CEST

Martin, Graeme (SELEX) (UK) wrote:
> TortoiseSVN 1.3.3, Build 6219 - 32 Bit
> When comparing revisions a unified diff file is created. If this diff
> file contains different types of eol styles (because some of the
> diffed files have NEWLINE and some have CRLF) TortoiseSVN fails to
> parse the unified diff file and fails silently. A list of files is
> presented but this list is incomplete. No file is reported after the
> first filename in the unified diff file with NEWLINE characters i.e.
> If 100 files are different and appear in the unified diff file but
> the first file (and only the first file) uses NEWLINE characters then
> only the first file appears in the list of changed files. I have now
> set the svn:eol-style=native property on all my source files but I
> cannot fix files already in the repository. Urgently need a fix for
> this.

I can't reproduce this. Can you please provide a patch file and the
files to patch (testfiles are ok) so I can reproduce this?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue May 16 20:56:26 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.