You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Stefan Haller <ha...@ableton.com> on 2004/11/05 15:00:44 UTC
merge of new files and eol-style
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
Re: merge of new files and eol-style
Posted by Ben Collins-Sussman <su...@collab.net>.
On Nov 5, 2004, at 9:07 AM, C. Michael Pilato wrote:
> haller@ableton.com (Stefan Haller) writes:
>
>> 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?
>
> Yes, it can. And you know, I think I will. :-)
>
> Please file an issue in our tracker, and if possible, attach a script
> that reproduces the problem on a small dataset.
>
The bug is already filed and well-known. In fact, it's being actively
worked on right now:
http://subversion.tigris.org/issues/show_bug.cgi?id=2064
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge of new files and eol-style
Posted by "C. Michael Pilato" <cm...@collab.net>.
haller@ableton.com (Stefan Haller) writes:
> 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?
Yes, it can. And you know, I think I will. :-)
Please file an issue in our tracker, and if possible, attach a script
that reproduces the problem on a small dataset.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org