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

Re: Merge bug(let)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-02-26 17:51:19 CET

mark benedetto king <mbk@boredom.org> writes:

> On Wed, Feb 26, 2003 at 01:12:30PM +0000, Philip Martin wrote:
> >
> > <Whisper>
> > Or how about we abandon eol-conversion as a bad idea?
> > </Whisper>
> Look how hard it is to get all the edge-cases of even well-defined
> client-side mangling^Wfiltering right!

The edge-cases have to be identified. Then the correct behaviour has
to be determined. Only then can it be implemented. Regression tests
need to be written to ensure it works. I'm not sure we got past the
first stage yet...

Off the top of my head: on Windows I have a file with svn:eol-style
set to native. I add some new lines with CRLF termination. I update
the working copy to a revision without svn:eol-style. All of the
lines in the new text-base are LF, the corresponding lines in the
working copy need to get changed to LF. Do the new lines that are
local to my working copy get changed? If you think they should be
changed does your opinion change if the new text-base contains a
mixture of CRLF and LF lines?

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 26 17:52:09 2003

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