git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Path filtered history not maximally simplified

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 22, 2008, 19:52 UTC
Message-ID
<7vve3eh6yu.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<47E3BCD5.2070405@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
Show 11 quoted lines
> 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"!)

Just a nomenclature, but independent changes merged trivially cleanly are "normal" merges, not evil.

Evil merges are the ones that actually change the result in such a way that new lines in --cc output do not have _any_ counterpart in any of the parents.

Previous: Johannes Sixt
Message 3 of 3 in “Path filtered history not maximally simplified”
  1. Johannes SixtMar 21, 2008
  2. Johannes SixtMar 21, 2008
  3. Junio C HamanoMar 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.