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

[Guillermo Gonzalez]

On Fri, Sep 19, 2008 at 12:49 AM, John Arbash Meinel
<john at arbash-meinel.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
[snip]
>
> 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.
>
>
> I personally believe the new algorithm is overall better, because these sorts
> of changes are 'noise'.
>

a BIG +1 on this proposed output.

Cheers,

--
Guillermo