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

Re: eol conversions, merging

From: <peter.westlake_at_arm.com>
Date: 2001-08-30 10:39:58 CEST

On 2001-08-29 22:21:22 Branko Čibej wrote:
>Jimm Grimm wrote:
>
>>Hi!
>>
>> I'm glad to see that you are addressing binary/ascii file issues.
>>Actually, it is that issue that led me to find out about your project.
>>
>> You probably have already looked at most of these questions, but I
>>didn't have time to read your whole archive. So I'll just spout off a
bunch
>>of issues I'm aware of:
>>
>Look at
>
> http://subversion.tigris.org/servlets/ReadMsg?msgId=33491&listName=dev
>
>
>and the following thread. I think you'll find all your questions answered.

Jimm's mail does add one useful thing, I think: the term
"mergeable" makes the issues much clearer than "binary",
because "binary" implies things about line endings and
merging and keywords. Post-M3 (ducks below parapet :-)
it might be helpful to change the terminology. I bet the
design would be easier to understand because of it.

Looking at that mail thread again, I don't think it addresses
the question of mergeability. It's assumed that binary files
can't be merged.

One little thing about avoiding corruption of binary files,
with apologies to those who know it already: the Netatalk
software for publishing Unix files to a Mac has a completely
reversible algorithm. It converts CR to LF *and* LF to CR,
so it gives the correct results for Mac to Unix, Unix to Mac,
and - this is the clever bit - a binary file containing both
CR and LF can be restored 100% correctly simply by applying
the conversion again. I know SVN has three kinds of line
endings to deal with, but it may well be possible to apply
the principle. Again, apologies if it already works this way.

Peter.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:37 2006

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

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