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

merge of new files and eol-style

From: Stefan Haller <haller_at_ableton.com>
Date: 2004-11-05 16:00:44 CET

Suppose I svn merge from X to Y, and X has a new file that is not in Y
yet. If that file has svn:eol-style=native, the added file in the Y
working does not have native line feeds, but Unix line feeds.

Can this be considered a bug?

At first sight it doesn't seem to cause major problems, because as soon
as I commit Y, the file is converted to native line feeds, so all is
well. Trouble is, we have editors that don't work well with Unix files,
and they will *sometimes* cause mixed Unix/DOS line feeds when the newly
added files need to be edited before commiting, to make them compile in
the new destination. This can be a major inconvenience.

-- 
Stefan Haller
Ableton
http://www.ableton.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 5 16:01:14 2004

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