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

Re: diff labels & issue #1538

From: Branko ─îibej <brane_at_xbc.nu>
Date: 2004-11-23 07:23:40 CET

kfogel@collab.net wrote:

>Issue #1538 is about printing paths in local style -- mainly paths in
>error messages.
>
>However, as I was finishing up #1538, I ran across the code in
>libsvn_diff/diff_file.c, which prints diff headers that include paths,
>and conflict markers that include paths.
>
>I'm not sure which of these should be in local style, if any.
>
>
The diff headers must not be in local style, because then you couldn't
create a patch on Windows and apply it on Unix. I couldn't care less
about the conflict markers.

>Possibly the latter should be, but the former should not, because diff
>format is sort of a standard and there may be tools that look at those
>headers? On the other hand, GNU diff on Windows has this interesting
>behavior:
>
> C:\TEMP> diff subdir/foo.txt subdir/bar.txt
> --- subdir/foo.txt
> +++ subdir/bar.txt
> [... etc ...]
>
> C:\TEMP> diff subdir\foo.txt subdir\bar.txt
> --- subdir\foo.txt
> +++ subdir\bar.txt
> [... etc ...]
>
>The labels simply match whatever the user specified.
>
>
Brrrrr, let's not even think about a horror like this. You'd have to do
all sorts of unwholesome things to get the original parameters into
libsvn_diff, and anyway, we don't want to generate nonportable patches.

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 23 07:24:38 2004

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