bzr update: Use (G) instead of (M) on merge?

[Aaron Bentley]

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

Jari Aalto wrote:
> Running:
> 
>     bzr update
> 
> Produces modified results:
> 
>      M  changelog
>      M  control.in
>      M  rules
>     All changes applied successfully.
>     Updated to revision 176.
> 
> For me this is a little disorienting, since I'm actaully asking
> a merge from repository. Would it be possible that on
> 'update', the 'M' flags would show instead e.g. mer(G)ed:

A merge can change far more than file contents.  If we changed M to G,
we would have to change all the letters and symbols in that output as
well.  I think it is far simpler to just remember that merge tells you
what *it* changed, not what *you* changed.

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

iD8DBQFG2tRk0F+nu1YWqI0RAv9kAJ4vxuBKA3pWpZCYJKYBXwEfivkQbACfYvRY
oOwZBsDggJqBtoTBWFLFZQY=
=zplh
-----END PGP SIGNATURE-----