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

BUG: inconsistent newlines

From: ESSI - Billie H. Cleek <bcleek_at_essystemsinc.com>
Date: 2006-09-21 20:58:54 CEST

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'. 

-- 
Billie H. Cleek
Project Manager
3259 E. Sunshine St
Suite AA
Springfield, Missouri 65804
   Tel: (417) 886-2528
   Fax: (417) 886-2541
bcleek@essystemsinc.com
http://www.essystemsinc.com
PGP: 0xE9734285
Fingerprint = 1CF8 1903 8574 EFAD 0322  1A2E CC02 52B8 E973 4285
---------------------------------------------------------------------
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:00:30 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.