[MERGE][0.10] re: make bzr work with diffutils >= 2.8.4

[John Arbash Meinel]

Marien Zwart wrote:
> From diffutils NEWS:
> 
> '''Diff now simply prints "Files A and B differ" instead of "Binary
> files A and B differ".'''
> 
> bzr checks for "binary files" in the output in diff.py and
> test_diff.py. If the "binary" bit is made optional it passes its tests
> with current diffutils. According to John A. Meinel in launchpad bug
> 57614 this code is triggered when binary conflicts are encountered.
> 
> Attached are two bundles, one for 0.9 and one for bzr.dev, that fix
> this.
> 

I'm happy with the change (+1), and think it is reasonable to get it
into bzr-0.10. I'm not sure if we'll backport an 0.9, considering
0.10-rc1 is set for release on Monday.

I changed the subject to hopefully make it obvious that this should be
merged.

Also, we generally use the [MERGE] syntax, rather than [bundle]. Bundle
is just an implementation detail.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060825/5ffd6e14/attachment.pgp