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

RE: Compressed Pristines

From: Bert Huijben <bert_at_qqmail.nl>
Date: Mon, 12 Mar 2012 16:58:24 +0100

> -----Original Message-----
> From: Mark Phippard [mailto:markphip_at_gmail.com]
> Sent: maandag 12 maart 2012 16:26
> To: Erik Huelsmann
> Cc: dev
> Subject: Re: Compressed Pristines
> On Mon, Mar 12, 2012 at 11:15 AM, Erik Huelsmann <ehuels_at_gmail.com>
> wrote:
> > Exactly. So what you found is that for any eol style other than native,
> > use exactly that style. For native, we use LF.
> Just to bring this back on topic and to my original question, I was
> asking whether Hyrum's assertion that we pass the raw pristine to
> external diff tools is true. I was simply saying that would "break"
> these tools on Windows when the very commonly used
> svn:eol-style=native option is used. So it sounds like that is true
> and these tools would have to ignore whitespace to do a proper diff on
> Windows?

I think we also normalize the in-working-copy file to the same format before
passing it to a diff tool, so the diff tool doesn't have to do this hard

Note that this is only relevant to diff tools that are hooked in the
Subversion configuration. Tools like TortoiseSVN don't use our diff API, but
get the whole file instead.

(AnkhSVN just uses 'svn cat' to get the pristine file translated in local
format, including expanded keywords, etc. And then it maintains its own copy
while needed)

I'm not sure what the current state is, but in the past (around 1.5)
TortoiseSVN took the shortcut and just fetched the pristine file using a
svn_wc_ api.

Received on 2012-03-12 16:59:07 CET

This is an archived mail posted to the Subversion Dev mailing list.