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

diff labels & issue #1538

From: <kfogel_at_collab.net>
Date: 2004-11-23 01:24:57 CET

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.
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.

I haven't done anything in diff_file.c yet. Does anyone have any
opinions, about either the header paths or the conflict marker paths?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 23 01:27:12 2004

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