From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2007 05:34:29 GMT
Subject: Re: History over-simplification
Message-ID: <7v4phgzn6i.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20070927045640.31040.qmail@science.horizon.com>

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?