Re: Merging submodules

On Thu, 31 Jul 2008 21:03:26 +0200, "Santi Béjar" [off-list ref]
wrote:

On Thu, Jul 31, 2008 at 20:15, H.Merijn Brand [off-list ref] wrote:

quoted

On Thu, 31 Jul 2008 17:24:40 +0200, "Santi Béjar" [off-list ref]
wrote:

quoted

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.

Super. So I start with a .gitignore and continue this process. It
worked!

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

Thanks again!

-- 
H.Merijn Brand          Amsterdam Perl Mongers  http://amsterdam.pm.org/
using & porting perl 5.6.2, 5.8.x, 5.10.x, 5.11.x on HP-UX 10.20, 11.00,
11.11, 11.23, and 11.31, SuSE 10.1, 10.2, and 10.3, AIX 5.2, and Cygwin.
http://mirrors.develooper.com/hpux/           http://www.test-smoke.org/
http://qa.perl.org      http://www.goldmark.org/jeff/stupid-disclaimers/