From: Martin Waitz <tali@admingilde.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Sixt <J.Sixt@eudaptics.com>, git@vger.kernel.org
Subject: Re: [PATCH] submodule merge support
Date: Mon, 7 May 2007 18:44:34 +0200 [thread overview]
Message-ID: <20070507164434.GK30511@admingilde.org> (raw)
In-Reply-To: <alpine.LFD.0.98.0705070857100.3802@woody.linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 682 bytes --]
hoi :)
On Mon, May 07, 2007 at 09:02:00AM -0700, Linus Torvalds wrote:
> But if you have multiple merge-bases and you do a recursive merge to
> create a new *combined* merge-base, trying to do that for the submodule is
> just pointless.
Ah, now I see your point.
And yes, you are right.
> So not doing it in the low-level merger is right - because it is simply
> irrelevant at that stage. The low-level merger might as well ignore
> submodules.
But where to do it then?
Do a first run which simply ignores dirlinks and then do another run
which looks for all unmerged index entries and processes all dirlinks
by merging the submodule?
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-05-07 16:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-06 19:02 [PATCH] submodule merge support Martin Waitz
2007-05-06 22:07 ` Alex Riesen
2007-05-06 22:16 ` Martin Waitz
2007-05-06 22:18 ` Linus Torvalds
2007-05-07 9:03 ` Martin Waitz
2007-05-07 10:30 ` Johannes Sixt
2007-05-07 16:02 ` Linus Torvalds
2007-05-07 16:44 ` Martin Waitz [this message]
[not found] ` <alpine.LFD.0.98.0705070959060.3802@woody.linux-foundation.org>
[not found] ` <alpine.LFD.0.98.0705071015230.3802@woody.linux-foundation.org>
2007-05-07 19:33 ` Martin Waitz
2007-05-07 16:37 ` Martin Waitz
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=20070507164434.GK30511@admingilde.org \
--to=tali@admingilde.org \
--cc=J.Sixt@eudaptics.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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.
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).