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

Vincent Ladeuil v.ladeuil+lp at free.fr
Mon Sep 22 11:07:43 BST 2008


>>>>> "robert" == Robert Collins <robertc at robertcollins.net> writes:

    robert> sorry to revert my position on you, I think I need to understand this
    robert> more....

<snip/>

    >> You can argue for it either way, but if you look at the output of "bzr
    >> log
    >> bzr" you'll wonder why the first lines are:
    >> 
    >> ------------------------------------------------------------
    >> revno: 3677.1.6
    >> committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    >> branch nick: 233817-missing
    >> timestamp: Thu 2008-09-11 21:36:38 +0200
    >> message:
    >> merge bzr.dev
    >> 
    >> It happens because this revision merges new changes to 'bzr' from
    >> bzr.dev into
    >> vila's feature branch.

    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 :).

    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.

   Vincent



More information about the bazaar mailing list