use external diff tool in the ignore line-endings mode for merge

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-12-11 11:39 PM, Fredrik Staxeng wrote:
> Aaron Bentley <aaron at aaronbentley.com> writes:
> 
>> On 12-12-11 01:25 AM, Fredrik Staxeng wrote:
>>> Aaron Bentley <aaron at aaronbentley.com> writes:
>>> 
>>>> On 12-12-09 03:14 AM, Fredrik Staxeng wrote:
>>>>> If anybody has done this, I would be very grateful for any 
>>>>> details that you can tell me. Which version of diff3,
>>>>> perhaps where to get it, and how get bazaar to use it.
>>>> 
>>>> As far as I know, all versions of diff3 work.
>>> 
>>> Well then, please name one.
> 
> I asked you this question. You did not answer it.

That's true.  I gave you all the information you need to make a
decision, but I did not answer your precise question, because Google
is available to both of us, and I can give you no better answer than
it can.  I have no basis for preferring one version of diff3 over another.

> (We are running on Windows. Did I not make that clear enough to
> you?)
> 
>> --strip-trailing-cr is not typically provided by "bzr merge
>> --diff3", but it's trivial to patch locally.  (see
>> bzrlib.patch.py around line 85).
>> 
>> Aaron
> 
> It's not trivial. That means getting the bazaar source

Since Bazaar is a Python program, most people are running it from source.

> , figuring out the build system

Building it is not necessary.  It will run from the source directory.
 (It will run *faster* if you build the extensions, of course.)

> If you do bzr update on a bound branch

AFAIK this would affect any merge, not just update, and is not limited
to bound branches.

> , and the line endings has changed in a file, the result is a
> "merged" file that consists of the whole of f.THIS, followed by the
> whole of f.OTHER.
> 
> You can fix this after the fact using gnuwin32 diff. Put this in a
> bat file
> 
> "%ProgramFiles(x86)%\GnuWin32\bin\diff3.exe" -m %1.THIS %1.BASE
> %1.OTHER
>> %1
> 
> The result is using DOS line endings.

So if gnuwin32 diff3 is fixing your line endings, you should be able
to use the --diff3 flag to use it.  Is there a problem with doing that?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlDIpgUACgkQ0F+nu1YWqI3pkgCcC0CCnTvEKyZscOIGUOgHIF8X
D8EAn0+SCQGHlSMa0kdVkrqsCg3XqvWk
=zQVM
-----END PGP SIGNATURE-----