From: Matthias Urlichs <smurf@smurf.noris.de>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: piet@bluelane.com, Git Mailing List <git@vger.kernel.org>,
Piet Delaney <piet.delaney@gmail.com>,
Piet Delaney <pdelaney@bluelane.com>,
Avinash Kaul <avinash@bluelane.com>,
Aravind Srinivasan <aravinds@bluelane.com>
Subject: Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo.
Date: Wed, 20 Aug 2008 09:52:34 +0200 [thread overview]
Message-ID: <20080820075234.GF4047@smurf.noris.de> (raw)
In-Reply-To: <48ABCBFD.7070503@alum.mit.edu>
Hi,
Michael Haggerty:
> cvs2svn/cvs2git does not support this (called "incremental imports").
git-cvsimport tries to.
> It is quite hard to implement robustly. In fact, I claim that no tool
> handles incremental imports robustly, despite the fact that some claim
> to do so :-)
>
As people are habitually mucking with their CVS repositories, your best
way to reliably do an incremental import is to do a regular import,
put the two trees into the same git repository (easily achieved by a
line in .git/objects/info/alternates and strategic copying of the
tip-of-tree references), and git-rebase your non-CVS work.
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
- -
When mutilating cattle, avoid the ones with testicles.
-- The Evil Cultist List
prev parent reply other threads:[~2008-08-20 8:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-19 7:00 git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo Pete/Piet Delaney
2008-08-20 6:24 ` Michael Haggerty
2008-08-20 7:35 ` Pete/Piet Delaney
2008-08-20 7:47 ` Michael Haggerty
2008-08-20 7:52 ` Matthias Urlichs [this message]
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=20080820075234.GF4047@smurf.noris.de \
--to=smurf@smurf.noris.de \
--cc=aravinds@bluelane.com \
--cc=avinash@bluelane.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pdelaney@bluelane.com \
--cc=piet.delaney@gmail.com \
--cc=piet@bluelane.com \
/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).