From: Junio C Hamano <gitster@pobox.com>
To: linux@horizon.com
Cc: git@vger.kernel.org, spearce@spearce.org
Subject: Re: History over-simplification
Date: Wed, 26 Sep 2007 22:34:29 -0700 [thread overview]
Message-ID: <7v4phgzn6i.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070927045640.31040.qmail@science.horizon.com> (linux@horizon.com's message of "27 Sep 2007 00:56:40 -0400")
linux@horizon.com writes:
> These seem like roundabout ways of expressing the requirement.
> The desired rule is "no silent changes in the simplified history".
> E.g. if the revision history of a particular file is:
>
> +-C-+
> / \
> A---B B---D
> \ /
> +-B-+
>
> Then the normal code will notice that there are no changes on the
> lower branch, prune the merge entirely, and simplify to A---B---C---D.
> This is, however, misleading; the true history is A---B---C---B---D.
Do you denote the same content with the same letter in the
above?
If so, wouldn't the simplified history be just A-B-D?
next prev parent reply other threads:[~2007-09-27 5:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-27 4:56 History over-simplification linux
2007-09-27 5:34 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-09-23 4:46 Shawn O. Pearce
2007-09-25 22:42 ` Junio C Hamano
2007-09-26 15:55 ` Shawn O. Pearce
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=7v4phgzn6i.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=linux@horizon.com \
--cc=spearce@spearce.org \
/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).