Re: cg-log patches

From: Sean <seanlkml@sympatico.ca>
Date: May 9, 2005, 13:13 UTC
Message-ID: <4712.10.10.10.24.1115644427.squirrel@linux1>
In-Reply-To: <20050509121435.GB18382@pasky.ji.cz>

On Mon, May 9, 2005 8:14 am, Petr Baudis said:

Show 9 quoted lines

> But that makes no sense, since each merge will have enormous amount of
> files listed, making no sense. E.g. each merge of Cogito with Linus will
> have all the Cogito files listed, since they aren't in the Linus branch
> - but that's wrong, since the merge _to_ the Cogito branch concerns no
> Cogito files.
>
> In git, the parents list is unordered. But this is different in Cogito,
> where the first parent _is_ special. If you are merging _from_ branch B
> _to_ branch A, the order of parents will be always

But, there are commits (even in your tree) that aren't produced by Cogito.
 And the current logic gets them wrong.

Look at commit:  211232bae64bcc60bbf5d1b5e5b2344c22ed767e in your tree.

The current logic will miss the fact that one of the other parents altered, git-apply-patch-script. Seems better to over report, than under report changes, although I agree that some way must be found to handle the merge case.

Sean