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

Re: Text files with embedded (solitary) control-M

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2005-09-20 17:15:55 CEST

>>>>> "Paul" == Paul Koning <pkoning@equallogic.com> writes:

    Paul> I have a CVS repository that has a bunch of files with
    Paul> embedded control-M (\r) characters.

    Paul> I could try to figure out how to get cvs2svn *not* to set
    Paul> svn:eol-style=native on such files; that would leave the \r
    Paul> alone, right? But would it then at the SVN side make the
    Paul> files look like binary files?

I wouldn't think cvs2svn would mark those files with
svn:eol-style=native unless you asked it to. But in any case, I think
it'd be best to indeed suppress that behavior (i.e., ensure that
cvs2svn does _not_ set that property).

But I don't know what you mean by "at the SVN side make the files look
like binary files"; I think you're afraid that the presence of the
carriage-return will somehow cause subversion to prevent you from
merging those files. That's not the case; subversion will let you
merge just fine even if the files contain "binary" characters. The
only thing that will make subversion treat a file as unmergeable is
the svn:mime-type (see
http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.2 )

Unix ... is not so much a product as it is a painstakingly compiled
oral history of the hacker subculture.  It is our Gilgamesh epic.
        -- Neal Stephenson
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 20 17:31:28 2005

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

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