Comment 1 for bug 234708

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 234708] [NEW] diff --diff-options argument ignored

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

Jelmer Vernooij wrote:
> According documentation the argument --diff-options should be passed
> to the
> external diff program, but they aren't.

Yes they are.

As you may recall, diff --diff-options has been with us for many years,
and continues to work the same as it always has. It has nothing to do
with --using, except that they are mutually exclusive options.

$ bzr diff --diff-options -c
=== modified file 'baz'
*** baz 2008-05-25 07:31:25 +0000
- --- baz 2008-05-25 07:31:39 +0000
***************
*** 1 ****
! bar
- --- 1 ----
! qux

The --using option already allows command options to be specified, so
there's no reason why it would need to support --diff-options.

$ bzr diff --using 'diff -c'
=== modified file 'baz'
*** old/baz 2008-05-25 03:31:25.000000000 -0400
- --- new/baz 2008-05-25 03:31:39.000000000 -0400
***************
*** 1 ****
! bar
- --- 1 ----
! qux

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

iD8DBQFIORaM0F+nu1YWqI0RArH+AKCFlFCij2o/uGHh7/bmYl9QKcdbRQCbB8zE
SG144SWsSED+E2ugQROPkB0=
=2rVc
-----END PGP SIGNATURE-----