[MERGE] left align log output if it only contains merge revisions

John Arbash Meinel john at arbash-meinel.com
Fri Jul 6 19:55:38 BST 2007


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

Matthew D. Fuller wrote:
> On Mon, Jul 02, 2007 at 09:33:51AM -0500 I heard the voice of
> John Arbash Meinel, and lo! it spake thus:
>> I think I agree with Aaron. I prefer the indenting consistency over
>> the left justification.
> 
> FWIW, I'm in agreement there, with one but.
> 
> BUT, I wish log did the right thing when showing up TO a non-mainline
> rev.  I should be able to pretend to be another branch.
> 
> Or another way, if I do
> 
> % bzr log -r..123.45.6.7
> 
> it should give me the same result as
> 
> % bzr branch -r123.45.6.7 . ../tmp
> % cd ../tmp && bzr log
> 
> 
> That would be not really quite related to this in particular, but it
> is related to the general "show the revisions differently than just
> cutting out a bunch of lines from a full 'log'".

Interesting thought. One of the bigger side effects is that doing:

bzr log -r 123.45.6.7

Will end up showing you something like:

- -------------
revno: 234
message:
  ...


Which is a little weird that you specify one revision number, and you get back
a different one.
We could make it clearer with something like:
branch revno: 123.45.6.7
as mainline revno: 234

Or some other strange hackery like that.

Conceptually this would cause other side effects, too. Like:

bzr log -r -10..123.45.6.7

Would at least sound like you want the last 10 revisions on the '123.45.6.7'
branch.

Anyway, I think it would be hard to make something like this clear and obvious
for people who didn't understand our particular revno quirks.

Maybe we could have a '--tip-as-mainline' flag, which would make the tail
revision (the one specified) be considered the branch mainline.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGjpAqJdeBCYSNAAMRAom9AJ4hiFhODT0/q5fDDg219wbwNyW0sACeMOBQ
tdUO4t2HsubglXwPNXuBeH4=
=tsMk
-----END PGP SIGNATURE-----



More information about the bazaar mailing list