git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Merging (joining/stiching/rewriting) history of "unrelated" git repositories
Date: Fri, 17 May 2019 15:08:01 +0200	[thread overview]
Message-ID: <CAA01Csq0eX2L5cKpjjySs+4e0Sm+vp=10C_SAkE6CLpCHBWZ8g@mail.gmail.com> (raw)
In-Reply-To: <CAA01Csqu6g0QPLNG5LOnkSzN=-De5X=KnqyDS3Bqb980+_FQ+A@mail.gmail.com>

On Thu, May 16, 2019 at 8:38 AM Piotr Krukowiecki
<piotr.krukowiecki@gmail.com> wrote:
>
> On Wed, May 15, 2019 at 10:34 PM Elijah Newren <newren@gmail.com> wrote:
> >
> > On Wed, May 15, 2019 at 8:30 AM Ævar Arnfjörð Bjarmason
> > <avarab@gmail.com> 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.
[...]
> > > 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)

I'll try writing some script using the filter-repo. Looked at
splice_repos.py and fast-export/fast-import format and it looks
promising / relatively simple.


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

I tried using it but it didn't work. Don't remember what was the problem though.


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

I tried this - use svnadmin dump + svndumpfilter + svnadmin load to
remodel svn repository and "splice" the history (by replacing 2nd
project paths to appear to be added to the 1st project path). But it
didn't work. The resulting svn repository had incorrect history (from
my point of view).

I also looked at reposurgeon. Maybe it could do the splicing, but I
given up on learning it, documentation isn't very helpful and there's
not enough examples in the internet...


-- 
Piotr Krukowiecki

  reply	other threads:[~2019-05-17 13:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-15 14:52 Piotr Krukowiecki
2019-05-15 15:25 ` Ævar Arnfjörð Bjarmason
2019-05-15 20:33   ` Elijah Newren
2019-05-16  6:38     ` Piotr Krukowiecki
2019-05-17 13:08       ` Piotr Krukowiecki [this message]
2019-05-20 13:54     ` Jakub Narebski
2019-05-21  7:53       ` Piotr Krukowiecki
2019-05-16  6:10   ` Piotr Krukowiecki

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAA01Csq0eX2L5cKpjjySs+4e0Sm+vp=10C_SAkE6CLpCHBWZ8g@mail.gmail.com' \
    --to=piotr.krukowiecki@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    /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.
Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).