From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 05 Oct 2010 19:20:18 GMT
Subject: Re: cvs importing a forked project
Message-ID: <AANLkTimnvAXAiE=03E3VdXSeP3pQBa8UTH548vEWsYsG@mail.gmail.com>
In-Reply-To: <AANLkTi=DRWeJc5gW0Rio9NZh5a02FQtdd9TeEzOkBimr@mail.gmail.com>

On Tue, Oct 5, 2010 at 18:38, Eric Frederich <eric.frederich@gmail.com> wrote:
> Interesting.  Looks easy to use except I can't figure out how to get
> the two projects imported to the same git project.
>
> If I run the following...
>
> $ git cvsimport -C myproject -d /some/vault projects/foo_old
> $ git cvsimport -C myproject -d /some/vault projects/foo_new

Either switch to a new parentless branch between the two (I don't know
cvsimport), or import them in two distinct git repositories. Then when
that's finished do:

    git init the-merge &&
    cd the-merge &&
    git remote add ~/cvs-repo-1 &&
    git remote add ~/cvs-repo-2 &&
    git remote update

And you'll have all those commits / branches / tags from both of them
to work with.