From: Eric Frederich <eric.frederich@gmail.com>
To: Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil>
Cc: git@vger.kernel.org
Subject: Re: cvs importing a forked project
Date: Tue, 5 Oct 2010 14:38:37 -0400 [thread overview]
Message-ID: <AANLkTi=DRWeJc5gW0Rio9NZh5a02FQtdd9TeEzOkBimr@mail.gmail.com> (raw)
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:
> 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
>
next prev parent reply other threads:[~2010-10-05 18:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 17:38 cvs importing a forked project Eric Frederich
2010-10-01 17:53 ` Ævar Arnfjörð Bjarmason
2010-10-01 17:57 ` Brandon Casey
2010-10-05 18:38 ` Eric Frederich [this message]
2010-10-05 19:20 ` Ævar Arnfjörð Bjarmason
2010-10-06 14:51 ` Eric Frederich
2010-10-06 16:34 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=DRWeJc5gW0Rio9NZh5a02FQtdd9TeEzOkBimr@mail.gmail.com' \
--to=eric.frederich@gmail.com \
--cc=brandon.casey.ctr@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).