[Merge] disable diff3 on win32

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>> Aaron Bentley wrote:
>>
>>> This patch disables diff3 on win32, because typical diff3
>>> implementations on win32 do not properly preserve line endings.
> 
>> Doesn't diff3 support the --binary flag (same as diff & patch). I
>> remember dealing with all of this for Arch.
> 
> No, it doesn't.  At least, 2.8.7 doesn't.
> 
>> I realize there is no "native" diff3 on Windows anyway. You have to
>> install it in some non-standard method. But I don't think you have to
>> specifically disable the tests.
> 
> We have to specifically disable diff3 because it will mangle
> line-endings, and I don't want that happening to users.  If we disable
> it without disabling the tests, we'll get test case failures.
> 
> Aaron
> 

I'll go along with you then. My testing seems to agree with you.

It seems we must not have used diff3 for applying patches in Arch very
often. (We used diff to create them, and patch to build revision
libraries, and revlibs were where corruption was happening).

Actually, I think I remember now that I originally introduced a patch
which added --binary to diff3, and didn't ever fail for me (because it
was never tested), but someone else ran into the fact that there is no
--binary flag for diff3.

Anyway, the other point I would want to mention is that probably diff3
isn't safe under cygwin either. Though I suppose it is more likely to be
safe than win32.

So you may want to change the fix to be:

if sys.platform in ('win32', 'cygwin'):
	raise Diff3NotSafe(...)

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060504/c5245f50/attachment.pgp