[RFC] Change to use 'merge_sort' for per-file-log
John Arbash Meinel
john at arbash-meinel.com
Mon Sep 22 16:10:44 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
...
>
> Check the per-file graph; if your merge commits are recording changes to
> it, there must be (arbitrarily far back) a change that *you made* and
> which hasn't been merged to bzr.dev. (see the commit_builder
> per-repository tests to understand this).
The sticking point is that "bzr log file" doesn't only use the per-file
graph. It projects the per-file graph onto the whole tree graph, and
includes nodes that merged the changes.
...
>> Hmmm. That's really noise. In fact redoing 'bzr log bzr' today
>> will show you several such revisions introducing that same change
>> (7 -> 8) because they are all merges from bzr.dev.
>
> If its noise, there is a bug I think.
>
> -Rob
>
It depends on 'noise' levels. If you do "bzr log -v" it will show a
change for file 'bzr' against the left-hand parent.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkjXtXQACgkQJdeBCYSNAAPC7gCg2GDZj9IdbcNV7rQCnrA7MMk2
MoIAoKBceYKUn3qNq6H1TJAfIA8jo8s0
=2juT
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list