From: "Santi Béjar" <sbejar@gmail.com>
To: "H.Merijn Brand" <h.m.brand@xs4all.nl>
Cc: "Petr Baudis" <pasky@suse.cz>,
"Brian Gernhardt" <benji@silverinsanity.com>,
"Git List" <git@vger.kernel.org>,
"Lars Noschinski" <lars-2008-1@usenet.noschinski.de>
Subject: Re: Merging submodules
Date: Thu, 31 Jul 2008 21:03:26 +0200 [thread overview]
Message-ID: <8aa486160807311203o3fb4deb8u4a5ae57818c76fab@mail.gmail.com> (raw)
In-Reply-To: <20080731201530.067be667@pc09.procura.nl>
On Thu, Jul 31, 2008 at 20:15, H.Merijn Brand <h.m.brand@xs4all.nl> wrote:
> On Thu, 31 Jul 2008 17:24:40 +0200, "Santi Béjar" <sbejar@gmail.com>
> wrote:
>
>> I see all OK. Can you provide a self consistent simple testcase that
>> shows what is wrong?
>
> Yes. was rather easy.
> http://www.xs4all.nl/~hmbrand/testcase.tgz
>
It is because you cannot merge a branch with an empty branch. So, or
you create an initial commit in the "superproject" or you create a
commit just moving the files of the first module as in:
http://article.gmane.org/gmane.comp.version-control.git/79887
Santi
next prev parent reply other threads:[~2008-07-31 19:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-30 23:03 Merging submodules (was Re: Feature suggestion: git-hist) Brian Gernhardt
2008-07-31 7:21 ` H.Merijn Brand
2008-07-31 12:39 ` Merging submodules H.Merijn Brand
2008-07-31 13:06 ` Petr Baudis
2008-07-31 15:01 ` H.Merijn Brand
2008-07-31 15:24 ` Santi Béjar
2008-07-31 18:15 ` H.Merijn Brand
2008-07-31 19:03 ` Santi Béjar [this message]
2008-07-31 20:44 ` H.Merijn Brand
2008-08-01 7:04 ` H.Merijn Brand
2008-08-01 9:52 ` Santi Béjar
2008-08-01 10:35 ` H.Merijn Brand
2008-08-01 11:34 ` Santi Béjar
2008-08-04 13:24 ` H.Merijn Brand
2008-08-04 13:40 ` Petr Baudis
2008-08-04 13:57 ` H.Merijn Brand
2008-08-04 14:06 ` Petr Baudis
2008-07-31 13:17 ` Santi Béjar
-- strict thread matches above, loose matches on Subject: below --
2008-07-30 22:59 Brian Gernhardt
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=8aa486160807311203o3fb4deb8u4a5ae57818c76fab@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=h.m.brand@xs4all.nl \
--cc=lars-2008-1@usenet.noschinski.de \
--cc=pasky@suse.cz \
/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).