Re: cvs importing a forked project
- From
Eric Frederich <eric.frederich@gmail.com>
- Date
- Oct 5, 2010, 18:38 UTC
- Message-ID
- <AANLkTi=DRWeJc5gW0Rio9NZh5a02FQtdd9TeEzOkBimr@mail.gmail.com>
- In-Reply-To
- <Ci4laGuWQaUrmZdwH9nojZ77bfNScQVKlCGXCSR6hP816oyKCfkncQ@cipher.nrlssc.navy.mil>
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
... then the projects look to be merged at some arbitrary point in time based on date. I'm not even sure if the entire history of foo_new is imported. This is just based off of what gitk is showing me but it seems to take the entire history of foo_old but when importing foo_new but it looks like only commits made after the last commit of foo_old are imported.
Obviously this isn't even using grafts since there is no grafts file. How do I get these two projects imported in their entirety into a single git repository so that I can create my own grafts file? Also, once I have my two projects imported into the same grafts file they should be completely independent right?... how do I switch between them then or even know what the SHA-1's are if they're not connected at all?
Thanks, ~Eric
On Fri, Oct 1, 2010 at 1:57 PM, Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil> wrote:
Show 22 quoted lines
> On 10/01/2010 12:38 PM, Eric Frederich wrote: >> 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 >