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

Re: information about storing text-only files

From: Frodak <frodak17_at_yahoo.com>
Date: 2007-02-03 16:17:16 CET

--- Les Mikesell <lesmikesell@gmail.com> wrote:

> Erik Huelsmann wrote:
>
> >> I would think, ideally, that it would show the
> >> property change only as it is still a text file
> and
> >> only the EOL style has changed.
> >
> > But subversion doesn't know about text files :-)
> It only knows it
> > needs to do certain transforms on special events
> in order to make sure
> > the user has the right eol style in his working
> copy. Nothing more.
>
> If that were true it wouldn't make any sense to show
> diffs as lines. If
> it understands the concept of lines it should know
> they didn't change.
> If it doesn't the diffs should only be binary byte
> differences. What
> does a line or eol style mean to something that
> doesn't know about text
> files?

Subversion can handle a lot of EOL issues. Just try
it out.

$ svn diff file:///svn/text/tags/v1
file:///svn/text/tags/v2
Index: source.txt
===================================================================
--- source.txt (.../v1) (revision 17)
+++ source.txt (.../v2) (revision 17)
@@ -5,4 +5,5 @@
 
 This is a LF line
 This is a LF line
-This is a LF line
+This is a new CRLF line
+This is a LF line

The file source.txt has no properties set and has
mixed EOLs.

Now if I merge this into the trunk which has
svn:eol-style = native it will correctly normalize the
EOLs in the new files. If I don't have svn:eol-style
set then it will not normalize the EOLs and the
working copy will have mixed EOLs.

 
____________________________________________________________________________________
Never miss an email again!
Yahoo! Toolbar alerts you the instant new Mail arrives.
http://tools.search.yahoo.com/toolbar/features/mail/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 3 16:17:47 2007

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