On Thu, 31 Jul 2008 17:24:40 +0200, "Santi Béjar" <sbejar@xxxxxxxxx> wrote: > On Thu, Jul 31, 2008 at 17:01, H.Merijn Brand <h.m.brand@xxxxxxxxx> wrote: > > On Thu, 31 Jul 2008 15:06:26 +0200, Petr Baudis <pasky@xxxxxxx> wrote: > > > >> On Thu, Jul 31, 2008 at 02:39:55PM +0200, H.Merijn Brand wrote: > >> > > >> > 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? > >> > >> I would suggest re-reading Santi's suggestions: > >> > >> > You have, basically, two possibilities: > >> > > >> > 1) Add the module_# as submodules: > >> > http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html > >> > http://git.or.cz/gitwiki/GitSubmoduleTutorial > >> > 2) Add the submodules as subtrees (as gitk and git-gui in git.git) > >> > http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html > >> > >> I think the latter is specifically what you want. > > > > I got stuck in that process, as the new repo thinks all the files from > > the sub-folders belong to the top-folder: After this process, there are > > a lot of files from subfolder include in the "new" top-level folder. > > > > 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 test 133 > ll * 23875989 -rwxr-xr-x 1 merijn users 486 2008-07-31 20:08 git-join.sh 23875990 -rw-rw-rw- 1 merijn users 14385 2008-07-31 20:07 test-git.tgz 4gl: total 16 23871493 drwxrwxrwx 4 merijn users 4096 2008-07-31 20:01 . 23871492 drwxrwxrwx 3 merijn users 4096 2008-07-31 20:08 .. 23871494 drwxrwxrwx 3 merijn users 4096 2008-07-31 19:56 fnc 23875966 drwxrwxrwx 3 merijn users 4096 2008-07-31 20:04 include test 134 > bash git-join.sh Creating merge environment Recovering original repo's Initializing new repo Initialized empty Git repository in /work/lep/test/new/.git/ Merging include ... Updating Binclude remote: Counting objects: 9, done. remote: Compressing objects: 100% (5/5), done. remote: Total 9 (delta 1), reused 6 (delta 1) Unpacking objects: 100% (9/9), done. >From include * [new branch] master -> Binclude/master Created commit c2c491e: Merge include as our subdirectory 1 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 include/ini0.h >From include * branch master -> FETCH_HEAD Already up-to-date. Merging fnc ... Updating Bfnc warning: no common commits remote: Counting objects: 12, done. remote: Compressing objects: 100% (4/4), done. Unpacking objects: 100% (12/12), done. remote: Total 12 (delta 0), reused 9 (delta 0) >From fnc * [new branch] master -> Bfnc/master Automatic merge went well; stopped before committing as requested Created commit d7da4d6: Merge fnc as our subdirectory >From fnc * branch master -> FETCH_HEAD Already up-to-date. Done test 135 > ll new total 24 23887892 drwxrwxrwx 5 merijn users 4096 2008-07-31 20:11 . 23871492 drwxrwxrwx 4 merijn users 4096 2008-07-31 20:11 .. 23887973 drwxrwxrwx 8 merijn users 4096 2008-07-31 20:11 .git 23887893 drwxrwxrwx 3 merijn users 4096 2008-07-31 20:11 fnc 23887933 drwxrwxrwx 3 merijn users 4096 2008-07-31 20:11 include 23888029 -rw-rw-rw- 1 merijn users 56 2008-07-31 20:11 ini0.h test 136 > ll new/include/ total 16 23887933 drwxrwxrwx 3 merijn users 4096 2008-07-31 20:11 . 23887892 drwxrwxrwx 5 merijn users 4096 2008-07-31 20:11 .. 23887934 drwxrwxrwx 8 merijn users 4096 2008-07-31 20:04 .git 23888031 -rw-rw-rw- 1 merijn users 56 2008-07-31 20:11 ini0.h test 137 > What is ini0.h doing in new/ ? test 137 > cd new test/new 138 > git-ls-files fnc/foo.txt include/ini0.h ini0.h test/new 139 > -- 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
