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

Re: calling dosunix at a newline mismatch

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Mon, 17 Nov 2008 17:13:14 +0000

thomas dettbarn wrote:
> hello.
>
> i am currently working on a project where i am using windows and linux
> on the same files. linux, because it is easier to edit the files, and
> windows... well... because the compiler is only available as a windows
> executable.

So don't edit them at all in Windows? On which system do you run your
SVN client?

> anyhow, since i have to edit the files on both systems, every now and
> then a svn commit becomes tedeious. because it keeps complaining about
> the inconsistent newlines.
> whenever svn finds such a file, it abruptly stops the commit with a
> screeching halt, i have to call dos2unix on the file, and then i can
> commit it again.

Can this be solved by careful selection of line ending style and choice
of editors? For example, if your editor in Windows is able to preserve
unix line endings, then make sure your files always get checked out with
unix line endings, then you'll never have a problem editing them on
either system. Or it may be the other way round, all depending on your
tools

> and i was wondering: couldn't you guys make this dos2unix call
> mandatory? or optional through a commandline flag? or tell the users
> which of the files has such an inconsistancy?

That would mean svn making an assumption about *how* to deal with the
inconsistent line endings - consider the following

"some text\r\n"

with the intention of getting one line ending, but some formatters in
windows might turn this into
some text CRCRLF
which is arguably 2 line endings or even 3 - in short without
consistency you can't tell and can't therefore assume.
Yes dos2unix applies some sort of algorithm to make the assumption -
then you as a user have the opportunity to check what it did before you
commit - this would not be the case if it was "part of" the commit.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-17 18:13:50 CET

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.