From: Kevin Bracey <kevin@bracey.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] Make --full-history consider more merges
Date: Thu, 25 Apr 2013 18:48:47 +0300 [thread overview]
Message-ID: <5179505F.2000108@bracey.fi> (raw)
In-Reply-To: <7v61zb8j5d.fsf@alter.siamese.dyndns.org>
On 25/04/2013 04:59, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>>> So, given all that, revised patch below:
> I tried to squeeze the minimum test I sent $gmane/220919 to the test
> suite. I think the "do not use --parents option for this test"
> switch needs to be cleaned up a bit more, but it fails without your
> patch and does pass with your patch.
>
> I somehow was hoping that your fix to TREESAME semantics would also
> correct the known breakage documented in that test, but it seems
> that I was too greedy ;-)
Thanks for the test addition. Maybe we will be able to satisfy your
greed in this series. There could be more worth doing here, and I think
getting TREESAME precise is key.
I think I do want to take the step of storing "treesame per parent". And
once we do that, as well as avoiding the expensive re-diff, we have much
richer information readily available as a simplification input (and output).
I'm working on a patch that does this - filling in an initial treesame[]
array as a decoration in try_to_simplify_commit() is easy, and
maintaining the array through later parent rewrites isn't as onerous as
I feared - there are only a few places that rewrite parents after the
initial scan. With a couple of helper functions to do things like
"delete nth", I think it'll be quite tidy.
I believe that simplify_merges itself needs at least one addition, and
could use the treesame[] array to do it: if after doing reduce_heads, a
commit is now different to all remaining parents, but there was a
TREESAME parent eliminated, that parent should be reinstated. That would
clearly highlight missed merges, showing both that "older" TREESAME
parent and the newer !TREESAME parent that would have been taken in a
normal merge.
And maybe there's more simplify_merges could do, if it had this full
TREESAME information available.
(But even after you do all this stuff to get the right commits out, we
then hit a niggle of mine that gitk forces --cc diffs - even if it shows
shows the offending merge commit, you can't get it to do a diff...)
Kevin
next prev parent reply other threads:[~2013-04-25 16:24 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 18:00 Locating merge that dropped a change Kevin Bracey
2013-04-11 17:28 ` Kevin Bracey
2013-04-11 19:21 ` Junio C Hamano
2013-04-22 19:23 ` [RFC/PATCH] Make --full-history consider more merges Kevin Bracey
2013-04-22 19:49 ` Junio C Hamano
2013-04-23 16:35 ` Kevin Bracey
2013-04-24 22:34 ` Junio C Hamano
2013-04-25 1:59 ` Junio C Hamano
2013-04-25 15:48 ` Kevin Bracey [this message]
2013-04-25 16:51 ` Junio C Hamano
2013-04-25 17:11 ` Kevin Bracey
2013-04-25 18:19 ` Junio C Hamano
2013-04-26 19:18 ` Kevin Bracey
2013-04-26 19:31 ` [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges Kevin Bracey
2013-04-26 19:31 ` [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents Kevin Bracey
2013-04-27 23:02 ` Junio C Hamano
2013-04-28 7:10 ` Kevin Bracey
2013-04-28 18:09 ` Junio C Hamano
2013-04-26 19:31 ` [RFC/PATCH 3/3] simplify-merges: drop merge from irrelevant side branch Kevin Bracey
2013-04-27 22:36 ` [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges Junio C Hamano
2013-04-27 22:57 ` David Aguilar
2013-04-28 7:03 ` Kevin Bracey
2013-04-28 18:38 ` Junio C Hamano
2013-04-29 17:46 ` Kevin Bracey
2013-04-29 18:11 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5179505F.2000108@bracey.fi \
--to=kevin@bracey.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).