From: Santi Béjar <sbejar@gmail.com>
Date: Thu, 31 Jul 2008 19:03:26 GMT
Subject: Re: Merging submodules
Message-ID: <8aa486160807311203o3fb4deb8u4a5ae57818c76fab@mail.gmail.com>
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