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

[Robert Collins]

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

On Thu, 2008-09-18 at 22:49 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> The attached patch overrides my previous work, by changing how we determine
> what revisions to display. This is RFC because of the behavior change. Though
> I think most will probably *prefer* this behavior.
> 
> So, what is the behavior change. The new code shows merges *towards mainline*
> that include the a new change to the file, but ignore merges away. So for example:
> 
> A-.    # A creates 'foo'
> |\ \
> B C D  # C modifies 'foo'
> |/  |
> E   |  # Pulls in 'foo' verbatim from C
> |\  |
> | \ |
> |  \|
> |   F  # Pulls in 'foo' verbatim from E
> |  /
> | /
> |/
> G
> 
> The old algorithm would show A, C, E, and F, the new algorithm will not show F.

If D did not modify 'foo', then the per file graph for 'foo' will not
include a node "D" OR a node 'F'.

In fact, it will be:
"C":["A"]
"A":[]

So log should be showing A and C only. I think something is confused in
your sample data, or in your explanation.


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

vila *must* have modified 'bzr' in his feature branch for this to
happen.

So I think we must really show it - or check that the content of the
file is totally unaltered (do you do that?).

-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/98b00449/attachment.pgp