git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: piet@bluelane.com
Cc: Git Mailing List <git@vger.kernel.org>,
	Matthias Urlichs <smurf@smurf.noris.de>,
	Piet Delaney <piet.delaney@gmail.com>,
	Piet Delaney <pdelaney@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 08:24:25 +0200	[thread overview]
Message-ID: <48ABB899.4090608@alum.mit.edu> (raw)
In-Reply-To: <48AA6F8E.70807@bluelane.com>

Pete/Piet Delaney wrote:
> I'm running into a problem with git-cvsimport.  [...]
> 
> I'll take another stab at it tomarrow. Any thoughts or
> recommendations appreciated.

If this is a one-time conversion (i.e., you don't need to actively track
a live CVS repository), then I suggest that you try cvs2svn/cvs2git [1].
 It can migrate to git via a git-fast-import output stream [2].  All
cvsps-based tools necessarily have problems because cvsps (a) doesn't
output enough information for a reliable conversion and (b) gets
confused by certain patterns that commonly occur in CVS repository
histories.  cvs2svn can handle every CVS repository that we have seen
and is also highly configurable [3].

Michael

[1] http://cvs2svn.tigris.org/
[2] http://cvs2svn.tigris.org/cvs2git.html
[3] http://cvs2svn.tigris.org/features.html

  reply	other threads:[~2008-08-20  6:25 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 [this message]
2008-08-20  7:35   ` Pete/Piet Delaney
2008-08-20  7:47     ` Michael Haggerty
2008-08-20  7:52       ` Matthias Urlichs

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=48ABB899.4090608@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=pdelaney@bluelane.com \
    --cc=piet.delaney@gmail.com \
    --cc=piet@bluelane.com \
    --cc=smurf@smurf.noris.de \
    /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).