From: "Sean" <seanlkml@sympatico.ca>
To: "Petr Baudis" <pasky@ucw.cz>
Cc: "Jonas Fonseca" <fonseca@diku.dk>,
"GIT Mailing List" <git@vger.kernel.org>
Subject: Re: cg-log patches
Date: Mon, 9 May 2005 09:13:47 -0400 (EDT) [thread overview]
Message-ID: <4712.10.10.10.24.1115644427.squirrel@linux1> (raw)
In-Reply-To: <20050509121435.GB18382@pasky.ji.cz>
On Mon, May 9, 2005 8:14 am, Petr Baudis said:
> 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
next prev parent reply other threads:[~2005-05-09 13:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-08 17:35 cg-log patches Sean
2005-05-08 17:42 ` Marcel Holtmann
2005-05-08 18:26 ` Sean
2005-05-08 19:00 ` Marcel Holtmann
2005-05-08 19:18 ` Petr Baudis
2005-05-08 19:23 ` Sean
2005-05-08 19:25 ` Petr Baudis
2005-05-08 19:52 ` Sean
2005-05-08 19:27 ` Marcel Holtmann
[not found] ` <1792.10.10.10.24.1115575196.squirrel@linux1>
[not found] ` <20050508180312.GB9495@pasky.ji.cz>
[not found] ` <1896.10.10.10.24.1115577733.squirrel@linux1>
2005-05-08 19:01 ` Petr Baudis
2005-05-08 23:49 ` Jonas Fonseca
2005-05-09 3:45 ` Sean
2005-05-09 11:39 ` Jonas Fonseca
2005-05-09 12:14 ` Petr Baudis
2005-05-09 12:41 ` Jonas Fonseca
2005-05-09 13:13 ` Sean [this message]
2005-05-10 0:37 ` Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4712.10.10.10.24.1115644427.squirrel@linux1 \
--to=seanlkml@sympatico.ca \
--cc=fonseca@diku.dk \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.