Re: [TopGit PATCH] t/depend-add-using-export

From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Oct 9, 2010, 11:27 UTC
Message-ID: <AANLkTi=Xhd8DY+f1ZYR6dEhHvC-=50iHLnhdv8GTacNX@mail.gmail.com>
In-Reply-To: <20101009105456.GA7328@santana.dyndns.org>

On Sat, Oct 9, 2010 at 12:54, Olaf Dabrunz <Olaf.Dabrunz@gmx.net> wrote:

Show 13 quoted lines

> When the hand made tree is committed (as a hand made merge) on top of
> the base, we have a correct merge on top of the base.
>
> This actually should change everything. After such a "tg depend add", we
> have either brought in some removed dependency as well, or we did not.
> If we didn't, the removed deps in the base's history do not matter for
> subsequent merges done by "tg update". But if we did bring in a
> previously removed dep, the removed deps in the base's history _would_
> matter. But since we already made a successful merge on top of the
> base's history with a correct tree, and this merge also brings in the
> removed dep through the history from the new dep's side, subsequent "tg
> update" merges will use this hand made merge as the merge base, which is
> fine for future merges.

When I understand this correctly, this hand made merge commit on base, has also the just removed dep as parent. But the tree does not include any code from that dep. So git merge-base would select this commit as the merge base.

Right?

Bert

Show 7 quoted lines

>
> Olaf
>
> --
> Olaf Dabrunz (Olaf.Dabrunz <at> gmx.net)
>
>