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

Re: TortoiseMerge: "Cannot show diff because of inconsistent newlines in the file."

From: Mikkel Kirkgaard Nielsen <mkn_at_compugame.dk>
Date: 2007-01-18 15:16:21 CET

Jared Silva <jayrod@...> writes:

> Starting with 1.4.0, I have been getting an error with TortoiseMerge,
> "Cannot show diff because of inconsistent newlines in the file."

Just had the same problem. Also after an upgrade (from 1.3.5 to 1.4.1) we got
this message. After some investigation we found out that the new TortoiseMerge
don't like ctrl-Z (0x1a) characters in the end of the files in working base
(.svn/text-base/). Deleting them in the working copy doesn't solve the problem,
before the changes are comitted, to update the working base.

Make sure your editor allows you to see and edit the ctrl-z character if that
is also what is bugging you.

It could be the changes introduced by this bugreport
http://svn.haxx.se/tsvn/archive-2006-10/0264.shtml which has changed the

I think the ctrl-z ought to be ignored away, as it has been used as a EOF
marker/fill character in DOS and CP/M.

Mikkel Kirkgaard Nielsen

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jan 18 15:51:53 2007

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.