On Wed, May 15, 2019 at 10:34 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Wed, May 15, 2019 at 8:30 AM Ævar Arnfjörð Bjarmason > <avarab@xxxxxxxxx> wrote: > > > > On Wed, May 15 2019, Piotr Krukowiecki wrote: > > > > > Hello, > > > > > > I'm migrating two repositories from svn. I already did svn->git > > > migration (git-svn clone) and now have two git repositories. > > > > > > I would like to merge them into 1 git repository, but to merge also > > > history - branches and tags. > > > > > > The reason is that the svn repositories in fact represent one > > > "project" - you had to download both of then, they are not useful > > > separately. Tags were applied to both repositories, also list of > > > branches is almost identical for both. > > > > > > So right now I have: > > > > > > - projectA: > > > master: r1, r4, r5, r7 > > > branch1: r10, r11, r13 > > > - projectB: > > > master: r2, r3, r6 > > > branch1: r12, r14 > > > > > > The content of projectA and projectB is different (let's say projectA > > > is in subfolder A and projectB is in subfolder B). So revisions on > > > projectA branches have only A folder, and revisions on projectB > > > branches have only B folder. > > > > > > But I would like to have: > > > > > > - projectAB: > > > master: r1', r2', r3', r4', r5', r6', r7' > > > branch1: r10', r11', r12', r13', r14' > > > > > > Where all revisions have content from both projects. For example, the > > > r5' should have the "A" folder content the same as r5, but also should > > > have "B" folder content the same as in r3 (because r3 was the last > > > commit to projectB (date-wise) before commit r5 to projectA). > > > > > > There's additional difficulty of handling merges... > > > > > >> > > > Any suggestions on what's the best way to do it? > > > > > > > > > Currently I'm testing join-git-repos.py script > > > (https://github.com/mbitsnbites/git-tools/blob/master/join-git-repos.py) > > > but it's slow, memory inefficient and handles "master" branch only... > > > > > > > > > Thanks, > > > > You might be able to use https://github.com/newren/git-filter-repo > > Splicing repos is an interesting case, but unless the history is > linear and the branch/tag names exactly match and you are simplify > weaving commits together based on timestamp within the same > branch/tag, then I don't know what algorithm should be used to weave > them together. There are lots of choices, and "correct" may be very > usecase-specific. > > That said, filter-repo was designed to be usable as a library and has > a few simple examples of such usage, including one of splicing some > trivial repos together. (See > https://github.com/newren/git-filter-repo/blob/master/t/t9391/splice_repos.py > and https://github.com/newren/git-filter-repo/blob/master/t/t9391-filter-repo-lib-usage.sh#L90-L121) > As noted there, fast-export's diff against first parent handling > makes splicing commits into the second (or third) parent history of a > merge problematic as new files introduced in such locations would by > default appear to get deleted by the merge unless additional work is > done to also insert the files there. My example was meant as a simple > testcase that should be easy to inspect by others, so it just worked > with very short linear histories. > > Somewhat interestingly, a search on others having tried to solve this > same problem turned up > https://github.com/j5int/jbosstools-gitmigration, which apparently is > based on git_fast_filter, which is the predecessor of filter-repo. > Perhaps that tool would be useful to you as-is, though they apparently > do ignore merges. > > If folks have a good idea for a weaving algorithm that appears > generally useful rather than usecase-specific, then I may be > interested in coding it up as a more general example of using > filter-repo as a library. But every time I've thought about it before > it just sounded too hairy and too usecase specific so I've just punted > on it. At first I thought that joining history with branch/merge support should be simple, but in fact it is not. At least for git repo. Now I think it is impossible. It should be possible for svn, or for git repo migrated from svn which still has the git-svn-id string as part of commit message. So you know which branch any commit belongs. For example: projectA: - ra1 - ra3 - ra6 - ra9 * ra11 (master) | | - ra4 - ra7 - ra8 - (branchX) projectB: - rb2 - rb5 - rb10 - (master) Merged project AB should look like this: project AB: - ra1 - rb2 - ra3 - rb5 - ra6 - ra9 - rb10 * ra11 (master) | | - ra4 - ra7 - ra8 -------------- (branch) Because you know that rb5 was on branch "master" (trunk) then you know it should be applied to the same branch in projectA, but not to branch "branchX". This information is lost in git: projectA (git): - ra1 - ra3 - ra6 - ra9 * ra11 (master) | | - ra4 - ra7 - ra8 - You do not know which parent of ra11 represented the main "master" branch. Should rb5 be added after between ra4 and ra7, or between ra3 and ra6? Does it make sense? Maybe I should look for a way to first prepare "merged" svn repo projectAB. Maybe there's a tool which can do it. And then migrate it to svn. -- Piotr Krukowiecki
