Re: Path filtered history not maximally simplified

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mar 21, 2008, 13:49 UTC
Message-ID: <47E3BCD5.2070405@viscovery.net>
In-Reply-To: <47E3AE38.5060405@viscovery.net>

Johannes Sixt schrieb:

Show 13 quoted lines

> While investigating a path-filtered history in gitk, I noticed a layout
> like this:
> 
>      --A---------M--4--N
>         \       /     /
>          1--2--3-----5
> 
> There are no commits displayed on the upper line between A and M.
> Shouldn't this have been simplified to:
> 
>                   4--N
>                  /  /
>      --A--1--2--3--5

Ok, it turns out that M is an evil merge, i.e. the file in M is different from both A and 3, but in such a way that it does not show up in a diff --cc that has only 3 lines of context. In particular, one of the commits 1, 2, 3 added a single line at an isolated spot in the file, and I undid that addition in the merge commit M.

Sorry for the noise.

-- Hannes

(So, *that's* why they are called "evil"!)