[MERGE] Support logging single merge revisions with short and line log formatters.

Kent Gibson warthog618 at gmail.com
Sun Dec 2 12:24:42 GMT 2007


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


Alexander Belchenko wrote:
> Alexander Belchenko has voted tweak.
> Status is now: Conditionally approved
> Comment:
> I want to note that following code is incorrect. It was incorrect
> before and still incorrect now:
>
>     if to_file is None:
>         to_file = codecs.getwriter(user_encoding)(sys.stdout,
>                                                   errors='replace')
>
> You should not use user_encoding unconditionally.
> If bzrlib want to create wrapper around stdout it should use
> osutils.get_terminal_encoding().
>
> This patch is not about terminal encoding. But Kent [accidentally]
> touched this code. So I think this piece of code should be fixed as
> well now. This piece of code does not have proper test before, so
> I'm not intended to write new one now.
>
> If no one has objection, I'll tweak the code in question and merge it.
>
Well I object.  To block my patch because it makes an incidental
change to a line which is broken for other reasons makes little sense
to me.
As you pointed out yourself, my change is not relevant to the problem
you want to fix.
You are linking my patch to a totally independent problem, and the two
should be kept separate.

So my suggestion is to review my patch in isolation, then go ahead and
fix the other problem.


Cheers,
Kent.

p.s. Sorry for the slow response, but I've been otherwise occupied
this week.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHUqQKgoxTFTi1P8QRAhL2AJ4y5y/N4jGCdfhRgzzd71dIIg6ZXwCfSn30
jrpO0Vc8kiec8g2SK8pJ7Z8=
=Lkxr
-----END PGP SIGNATURE-----



More information about the bazaar mailing list