From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 01 Oct 2010 17:53:36 GMT
Subject: Re: cvs importing a forked project
Message-ID: <AANLkTi=QYHsUq320A3Sb=L4OSVOB2-P5LcpmjK9amjmo@mail.gmail.com>
In-Reply-To: <AANLkTimvaH4UYzmL9eS1Yq7WNaS+jPRfkajKPP=hjZWV@mail.gmail.com>

On Fri, Oct 1, 2010 at 17:38, Eric Frederich <eric.frederich@gmail.com> wrote:
> I have a project (several actually) where development was done in cvs
> for 10 years.  Then, about 5 years ago, a copy of the latest was made
> and development continued in a new project.
> Development in the old project stopped for the most part.
>
> Is there any way where I can combine these two projects in git?
> Basically, take the newer project's first commit and make its parent
> the the last commit of the older project.
> Development was pretty linear.

Sure, you import them both into git with cvs2git (or something like
that), then you fetch all the commits into a single git repository.

Then it becomes a problem of merging two git histories, something
that's widely documented and well understood.