← Back to team overview

bzr-mac team mailing list archive

Re: Problems with external diff commands and 2.3b4

 

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

On 1/15/2011 8:24 AM, Ian wrote:
> I was trying this piece of software, which integrates with
> bazaar: http://www.kaleidoscopeapp.com/ -- it simply adds this command
> to bazaar.conf:
> 
> ksdiff = 'diff --using="ksdiff-wrapper bzr"'
> 
> Using 2.2.2 "bzr ksdiff" works, but using 2.3b4 I get the following error:
> 
> bzr: ERROR: ksdiff-wrapper bzr could not be found on this machine
> 
> The command itself is on the path, and even if i force specify the
> absolute path in bazaar.conf, bzr still can't find it.

Try changing the ksdiff line in bazaar.conf to:

ksdiff = 'diff --using="ksdiff-wrapper" ---diff-options="bzr"'

The --using command must be the name or path to the external diff tool
only, any additional options to be passed on the commandline to the diff
tool must be given to bzr using the --diff-options option.

Ciao,
Gordon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJNMaZPAAoJEIrPJfWinA2uglsH/Rdn5CpqMAodbIsDxOiFz9ak
qx56/qqNWBCrC+StRvt6ifM4uLHRYdBT+JZzWYgXz84Y2kkzlXGDgH6YdZFtbAPM
FLu4RPQFkT/+vmXdBB5GbEkfwTaYEkqlfodfBi8mgxZVyuU40y7hJ1CAIIbt4Y4y
V+z+/Ird85r/km7VkrEMZ/RPB/OStoACgBkxEpQ5c3HbMSK9mzEkv+1aXnXfyl+A
d+xy/zhJdoh5DAg3TG4pBC80AXwjrCS04I4m4iWIzqXgHKOl1yyscgyoaNhnWH+6
10hc+EDkMnFipSWVNbBvkEdoP1pZe8+QIIFYxXMGRNvzotzSiFKWhsW+cCJN82o=
=HKOq
-----END PGP SIGNATURE-----



References