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

Re: TSVN patch util disagrees with TSVN diff

From: Robert Roessler <robertr_at_rftp.com>
Date: 2007-03-05 04:45:12 CET

Robert Roessler wrote:
> With 1.4.3 of TSVN on Windows XP SP2, I am finding that a generated
> patch file has an extra "diff" that neither TSVN's own diff or WinMerge
> finds (both diff utils are set to COMPARE whitespace).
> The spurious diff seems to be a line after the real diffs that has 2
> spaces, followed the string "in" without the quotes, and terminated with
> a *nix eol (LF) char (an additional LF char follows).
> I have verified the contents of both files with a hex viewer.

Sigh - never mind. A lot of this source is very similar, and I wasn't
at the correct "line" in the hex viewer. There is an extra CR char
that doesn't belong in one of these files at all (as they are supposed
to remain with *nix line-ends ONLY).

Fixing that clears up everything - both diffs AND the patch generator
now agree. :)

Robert Roessler

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Mar 5 04:46:04 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.