From 1eba3e5147e5097bef66cf7747a90d0bb870d363 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 22 Sep 2016 03:25:28 -0400 Subject: docs/cvsimport: prefer cvs-fast-export to parsecvs parsecvs maintenance was taken over by ESR, and the name changed to cvs-fast-export as it learned to support that output format. Let's point to cvs-fast-export, as it should have additional bug-fixes and be more convenient to use. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-cvsimport.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 00a0679a28..0d2967a115 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -22,7 +22,7 @@ DESCRIPTION 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 http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or -https://github.com/BartMassey/parsecvs[parsecvs]. +http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export]. Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one. -- cgit v1.2.3 From 72e0877a1dab75113792d13abb9d1b9fc4252922 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 22 Sep 2016 03:26:07 -0400 Subject: docs/cvs-migration: update link to cvsps homepage The old page gives a 404 now. Searching for "cvsps" via Google returns a GitHub project page as the top hit. Reported-by: Dan Pritts Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/gitcvs-migration.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index b06e852a85..faee5c21dc 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -117,7 +117,7 @@ Importing a CVS archive ----------------------- First, install version 2.1 or higher of cvsps from -http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make +https://github.com/andreyvit/cvsps[https://github.com/andreyvit/cvsps] and make sure it is in your path. Then cd to a checked out CVS working directory of the project you are interested in and run linkgit:git-cvsimport[1]: -- cgit v1.2.3 From 106b672adee17391e80c34913c8383e6b426b466 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 22 Sep 2016 03:26:28 -0400 Subject: docs/cvs-migration: mention cvsimport caveats Back when this guide was written, cvsimport was the only game in town. These days it is probably not the best option. Rather than go into details, let's point people to the note at the top of cvsimport which gives other options. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/gitcvs-migration.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index faee5c21dc..4c6143c511 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -116,6 +116,10 @@ they create are writable and searchable by other group members. Importing a CVS archive ----------------------- +NOTE: These instructions use the `git-cvsimport` script which ships with +git, but other importers may provide better results. See the note in +linkgit:git-cvsimport[1] for other options. + First, install version 2.1 or higher of cvsps from https://github.com/andreyvit/cvsps[https://github.com/andreyvit/cvsps] and make sure it is in your path. Then cd to a checked out CVS working directory -- cgit v1.2.3