[RFC] Change to use 'merge_sort' for per-file-log

Robert Collins robertc at robertcollins.net
Mon Sep 22 11:37:32 BST 2008


On Mon, 2008-09-22 at 12:07 +0200, Vincent Ladeuil wrote:

>     robert> vila *must* have modified 'bzr' in his feature branch
>     robert> for this to happen.
> 
> === modified file bzr
> --- bzr 2008-08-29 19:32:00 +0000
> +++ bzr 2008-09-10 04:54:57 +0000
> @@ -22,7 +22,7 @@
>  import sys
>  
>  # update this on each release
> -_script_version = (1, 7, 0)
> +_script_version = (1, 8, 0)
>  
>  if __doc__ is None:
>      print "bzr does not support python -OO."
> 
> 
> This modification is a direct consequence of the merge, so not
> strictly added by vila (and I don't thank John for associating me
> with noise-only revisions :).

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 per-file graph has nodes that are a subset of the revision graph
nodes, but its _not_ a subgraph. It can have arcs that the revision
graph doesn't, and can skip arcs the revision graph has.)

>     robert> So I think we must really show it
> 
> 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

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080922/2df77e0e/attachment.pgp 


More information about the bazaar mailing list