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

[Fredrik Staxeng]

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. 

(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, figuring out the
build system, installing build tools and dependents,  figuring out how to
change version identifiers, making the patch, and then rebuilding the
installer.

(For other bazaar victims googling for help)

Problem: bzr update breaks on differing line endings
 
If you do bzr update on a bound branch, 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. 

http://gnuwin32.sourceforge.net/packages/diffutils.htm

-- 
Fredrik Stax\"ang | rot13: sfgk at hcqngr.hh.fr
This is all you need to know about vi: ESC : q ! RET