From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Eric Frederich <eric.frederich@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: cvs importing a forked project
Date: Fri, 1 Oct 2010 17:53:36 +0000 [thread overview]
Message-ID: <AANLkTi=QYHsUq320A3Sb=L4OSVOB2-P5LcpmjK9amjmo@mail.gmail.com> (raw)
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.
next prev parent reply other threads:[~2010-10-01 17:53 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 [this message]
2010-10-01 17:57 ` Brandon Casey
2010-10-05 18:38 ` Eric Frederich
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=QYHsUq320A3Sb=L4OSVOB2-P5LcpmjK9amjmo@mail.gmail.com' \
--to=avarab@gmail.com \
--cc=eric.frederich@gmail.com \
--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).