[MERGE][328007] Fixed problem with `log -p` and non-ascii content of files: show_diff should write the diff to exact [stdout] stream.

Alexander Belchenko bialix at ukr.net
Thu Mar 12 07:11:21 GMT 2009


James Westby пишет:
> On Thu, 2009-03-12 at 08:33 +0200, Alexander Belchenko wrote:
>>> This seems to change the contract of the method, does it work if I pass
>>> in a StringIO to receive the diff?
>> Excuse my ignorance: what's "contract of the method"?
> 
> It means that it changes the way the method works. I thought that it
> would require to_file to be a StreamWriter, but I now see that I
> was wrong about that.
> 
>> This patch don't change behavior of existing code. But my first patch does change,
>> because require only bytestream, while this patch accepts both bytestream and
>> encoded stream.
> 
> Yes, sorry, I see what it is doing now, and I think it is good, so 
> BB:approve.
> 
> Bob, do you think this should go in to 1.13 as well?


Although this bug seems as very unpleasant regression, and I'm affected by it too.
But IIRC according to bzr.dev guidelines only critical bugfixes can go in after rc.




More information about the bazaar mailing list