[MERGE] Win32 fixes

[John Arbash Meinel]

Aaron Bentley wrote:
> Alexander Belchenko wrote:
> | Alexander Belchenko пишет:
> |
> |> Aaron Bentley пишет:
> |>
> |> AFAIK, often this bug appears on windows when file was not explicitly
> |> closed and immediately try to remove. I hope this helps.
> |
> |
> | Yes. This is the root of problem. Patch with fix is attached.
> 
> Thank you.
> 
> | I use diff3 ported to win32 from http://gnuwin32.sf.net. This program
> | implicitly convert all line-endings to CRLF. What we should do with this
> | ugliness?
> 
> How gross.  I can only think of gross solutions, like transforming the
> file before feeding it to diff3, and reversing the transform after diff3.
> 
> Aaron

Is there a '--binary' flag that you can pass to diff3? I know there was
one introduced to diff and patch explicitly for this sort of thing.

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/20060422/3022a5c5/attachment.pgp