Re: cvs importing a forked project
- From
- Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil>
- Date
- Oct 1, 2010, 17:57 UTC
- Message-ID
- <Ci4laGuWQaUrmZdwH9nojZ77bfNScQVKlCGXCSR6hP816oyKCfkncQ@cipher.nrlssc.navy.mil>
- In-Reply-To
- <AANLkTimvaH4UYzmL9eS1Yq7WNaS+jPRfkajKPP=hjZWV@mail.gmail.com>
On 10/01/2010 12:38 PM, Eric Frederich wrote:
Show 11 quoted lines
> Hello, > > 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.
You can do this very easily using grafts.
https://git.wiki.kernel.org/index.php/GraftPoint
filter-branch can be used to rewrite the history and make the grafts permanent.
-Brandon