Re: cvs importing a forked project

From: Eric Frederich <eric.frederich@gmail.com>
Date: Oct 6, 2010, 14:51 UTC
Message-ID: <AANLkTimawPYmqoH_tupOc6zsgSeTU=dqgXA9pB95m542@mail.gmail.com>
In-Reply-To: <AANLkTimnvAXAiE=03E3VdXSeP3pQBa8UTH548vEWsYsG@mail.gmail.com>

Thanks a bunch. That set of commands seemed to work except the "git remote add" commands needed a name. After doing that I saw both disconnected trees in gitk. I created my .git/info/grafts file and it looked good. I removed the two remotes afterwards and had to manually create a master branch.

I wanted to try to "switch to a new parentless branch" but don't know how. How can I create / switch to a new empty parentless branch?

On Tue, Oct 5, 2010 at 3:20 PM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 22 quoted lines

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