From: Bert Wesarg <bert.wesarg@googlemail.com>
To: "Bert Wesarg" <bert.wesarg@googlemail.com>,
"Olaf Dabrunz" <odabrunz@gmx.net>,
git@vger.kernel.org,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: [TopGit PATCH] t/depend-add-using-export
Date: Sat, 9 Oct 2010 13:27:44 +0200 [thread overview]
Message-ID: <AANLkTi=Xhd8DY+f1ZYR6dEhHvC-=50iHLnhdv8GTacNX@mail.gmail.com> (raw)
In-Reply-To: <20101009105456.GA7328@santana.dyndns.org>
On Sat, Oct 9, 2010 at 12:54, Olaf Dabrunz <Olaf.Dabrunz@gmx.net> wrote:
> 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
>
> Olaf
>
> --
> Olaf Dabrunz (Olaf.Dabrunz <at> gmx.net)
>
>
next prev parent reply other threads:[~2010-10-09 11:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 1:43 [TopGit PATCH] t/depend-add-using-export Olaf Dabrunz
2010-10-09 7:45 ` Bert Wesarg
2010-10-09 10:54 ` Olaf Dabrunz
2010-10-09 11:27 ` Bert Wesarg [this message]
[not found] ` <20101009121003.GA19991@santana.dyndns.org>
2010-10-09 12:21 ` Bert Wesarg
2010-10-09 12:21 ` Olaf Dabrunz
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='AANLkTi=Xhd8DY+f1ZYR6dEhHvC-=50iHLnhdv8GTacNX@mail.gmail.com' \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=odabrunz@gmx.net \
--cc=u.kleine-koenig@pengutronix.de \
/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 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 NNTP newsgroup(s).