On Wed, Jan 23, 2013 at 09:13:27AM -0800, Junio C Hamano wrote: > John Keeping <john@xxxxxxxxxxxxx> writes: > > > My preference would be for something like this, possibly with an > > expanded examples section showing how to pipe the output of cvsps-3 or > > cvs2git into git-fast-import: > > > > -- >8 -- > > > > diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt > > index 9d5353e..20b846e 100644 > > --- a/Documentation/git-cvsimport.txt > > +++ b/Documentation/git-cvsimport.txt > > @@ -18,6 +18,11 @@ SYNOPSIS > > > > DESCRIPTION > > ----------- > > +*WARNING:* `git cvsimport` uses cvsps version 2, which is considered > > +deprecated; it does not work with cvsps version 3 and later. If you are > > +performing a one-shot import of a CVS repository consider using cvsps-3, > > +cvs2git or parsecvs directly. > > + > > Imports a CVS repository into git. It will either create a new > > repository, or incrementally import into an existing one. > > > > -- 8< -- > > OK, that is certainly a lot simpler to explain. > > Is it "it does not work yet with cvsps3", or "it will not ever work > with cvsps3"? The impression I am getting is that it is the latter. The existing script (git-cvsimport.perl) won't ever work with cvsps-3 since features it relies on have been removed. > Also, should we have a suggestion to people who are *not* performing > a one-shot import, i.e. doing incremental or bidirectional? As far as I know cvsps is the only backend that attempts to support partial exports but the support for that in its fast-export mode needs work before I would consider it reliable. For now the existing git-cvsimport is the best option I'm aware of. John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html