peter.westlake@arm.com wrote:
>
>
>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.
>
Ah. Yes, I think I wrote about this issue in the original
notes/alpha_checklist.txt, which has been replaced now, and in a
previous discussion on the list. For instance, there's a difference
between diffs/patches over the wire, and diffs/patches/merges in the WC.
It's in the archives somewhere.
--
Brane �ibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
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