git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "H.Merijn Brand" <h.m.brand@xs4all.nl>
To: Brian Gernhardt <benji@silverinsanity.com>
Cc: Git List <git@vger.kernel.org>,
	Lars Noschinski <lars-2008-1@usenet.noschinski.de>
Subject: Re: Merging submodules
Date: Thu, 31 Jul 2008 14:39:55 +0200	[thread overview]
Message-ID: <20080731143955.034f0577@pc09.procura.nl> (raw)
In-Reply-To: <20080731092104.1a6ce8bd@pc09.procura.nl>

On Thu, 31 Jul 2008 09:21:04 +0200, "H.Merijn Brand"
<h.m.brand@xs4all.nl> wrote:

> I will now be playing with the results a bit. I have attached the
> script, in case you might want to use it in documentation or examples.
> For now, all the mods are hardcoded. No arguments and so on.
> 
> Again, Thanks!

There is a slight problem with this merging approach. The path names
are as they are/were in the submodules. In module_a, foo.pl was without
a leading module_a/ path, and now after integration, it still is. Is it
possible to rethink this whole process that integrates/merges the
several git repo's in subfolders into the current folder, as-if they
would have been in this folder in the first place?

Short summary: History made me have the current situation

	4gl
	4gl/fnc
	4gl/fnc/.git
	4gl/foo
	4gl/foo/.git
	:
	:
	4gl/zlork
	4gl/zlork/.git

Where I want

	4gl
	4gl/.git
	4gl/fnc
	4gl/foo
	:
	4gl/zlork

-- 
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/

  reply	other threads:[~2008-07-31 12:41 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   ` H.Merijn Brand [this message]
2008-07-31 13:06     ` Merging submodules 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
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=20080731143955.034f0577@pc09.procura.nl \
    --to=h.m.brand@xs4all.nl \
    --cc=benji@silverinsanity.com \
    --cc=git@vger.kernel.org \
    --cc=lars-2008-1@usenet.noschinski.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).