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

eol style differences, WAS: RE: svn commit: rev 5264 - trunk/subversion/libsvn_delta

From: Sander Striker <striker_at_apache.org>
Date: 2003-03-11 00:04:30 CET

> From: Branko Cibej [mailto:brane@xbc.nu]
> Sent: Monday, March 10, 2003 11:03 PM

> striker@tigris.org wrote:
>
> >Author: striker
> >Date: Mon Mar 10 13:45:28 2003
> >New Revision: 5264
> >
> >Modified:
> > trunk/subversion/libsvn_delta/diff.c
> >
> >
> Not directly related to your commit, but I see that "svn diff" no longer
> notices eoln-only changes. Isn't that a bit dangerous? I acceidntally
> changed the line endings in a file, and "svn diff" only showed the
> actual text changes. If I hadn't been careful to check the line endings,
> i might've committed lots of crud.

It doesn't? Well, that's not something that is caused by the diff code.
It only compares what it gets. Presumably you have a file with eol-style
set? These are translated to repository style (when appropiate) before
doing the diff. I proposed swapping it around so that the text base is
converted to working copy style prior to diffing in this thread:

  http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=31731

So far the outcome is inconclusive. Maybe we should do the conversion the
other way around, and maybe we shouldn't.

Whoops. That was the merge code... I haven't investigated the diff code,
but I assume it does the same (unlike checking if the file is binary...).

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 11 00:05:18 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.