[MERGE] show merge indicators in log --long
jelmer at samba.org
Sun Mar 29 16:30:58 BST 2009
-----BEGIN PGP SIGNED MESSAGE-----
Ian Clatworthy wrote:
> Also, if only one level is displayed and merges are found,
> the user is now advised how to see the nested merged
> revisions for --long and --short. (I decided against
> adding that advice in long --line mainly because that might
> break scripts parsing the output from there.)
I think you mean "log --line" :-)
> + def merge_marker(self, revision):
> + """Get the merge marker to include in the output or '' if None."""
Shouldn't this be "none" rather than "None" (as you're not referring to
the Python object) ?
Other than that, seems good to me.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar