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

Re: [TSVN] Some questions I couldn't get answered

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2005-06-01 19:15:59 CEST

"Simon Large" <slarge@slarge.plus.com> writes:

> Ah, I understand the problem now. And maybe there is a solution. TSVN
> passes the pristine copy directly to the external diff program. Maybe
> that is not a safe thing to do anyway, because the external program
> could modify the pristine copy. So we could solve 2 problems if the
> pristine copy was converted to the same eol-style in a temp file before
> passing to the external diff/merge program. That _might_ slow things
> down a bit for large files.

Subversion libraries do the opposite -- they convert the working copy
version to repository normal (LF) format, and also un-expand keywords,
and then diff against the pristine copy. This way, you don't get
spurious diffs for keyword expansion or newline conversion.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jun 1 19:17:14 2005

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.