using --diff-options to exclude a file

[Robert Collins]

On Tue, 2006-07-25 at 12:21 +1000, Jamie Wilkinson wrote:
> Hey,
> 
> I'm trying to generate a diff between two branches, but I want to exclude
> .bzrignore from the diff because it's not relevant to upstream.
> 
> bzr diff --diff-options='-x .bzrignore' ../upstream ./
> seems like the right thing to do, but this dies with the following error:
> 
> dawn% bzr diff --diff-options='-x .bzrignore' ../upstream ./
> === added file '.bzrignore'
> diff: standard output: Bad file descriptor
> bzr: ERROR: external diff failed with 2; command: ['diff', '--label',
> u'.bzrignore\t1970-01-01 00:00:00 +0000', '/tmp/bzr-diff-old-8CUmJB',
> '--label', u'.bzrignore\t2006-07-25 02:16:36 +0000',
> '/tmp/bzr-diff-new-Wv8Nqa', '--binary', '-u', '-x', '.bzrignore']
> 
> Is this a bug or am I using --diff-options the wrong way?

I think there is a bug open on this. At the moment using --diff-options
causes diff to always be invoked externally - and '2' from that means
'binary diff encountered - not failure.

I suggest you do 'bzr diff | filterdiff -x .bzrignore' as a workaround.

Cheers,
Rob



-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060725/651cf33d/attachment.pgp