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

Re: BUG: inconsistent newlines

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-09-21 21:27:50 CEST

ESSI - Billie H. Cleek wrote:
> 1.4
> Stefan Küng wrote:
>> ESSI - Billie H. Cleek wrote:
>>> When trying to compare two revisions of a file where one of the
>>> revisions has a mixture of newline sequences (some crlf, some lf, and/or
>>> some cr) the diff fails with an error message from TortoiseMerge of
>>> 'cannot show diff because of inconsistent newlines in file'.
>> Which version are you using?

If possible, can you send me the two files which give you that error?
(they're stored in your temp folder, when you hover the mousepointer
over the view title you will see the path in the tooltip).


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Sep 21 21:28:00 2006

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

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