summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-01 12:39:59 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-01 12:39:59 -0800
commit67d9c41c4a74619d81d9832efb25773126934852 (patch)
tree95cbba97d6aea8eba22349c8a2c31ee033551d9c
parent51a1d232a7c1bc6bbdb4ac47ab2e91ad3873b25b (diff)
parent1187ec99b93aefc3bfb6e360d285245745e1e390 (diff)
downloadgit-67d9c41c4a74619d81d9832efb25773126934852.tar.gz
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'
Warn people that other tools are more recommendable over cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport will not work with cvsps3. * jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated
-rw-r--r--Documentation/git-cvsimport.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 9d5353e8be..f059ea94da 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -18,6 +18,12 @@ 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
+link:http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
+link:https://github.com/BartMassey/parsecvs[parsecvs].
+
Imports a CVS repository into git. It will either create a new
repository, or incrementally import into an existing one.