summaryrefslogtreecommitdiff
path: root/Documentation/cvs-migration.txt
diff options
context:
space:
mode:
authorTommy M. McGuire <mcguire@crsr.net>2005-06-10 06:33:44 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 03:48:18 (GMT)
commit1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e (patch)
tree65840bcaf9013ab44ff580565ba5e6eca8cfa4f2 /Documentation/cvs-migration.txt
parent861cb6f02c91b66cdec572dd443ae947e795824a (diff)
downloadgit-1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e.zip
git-1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e.tar.gz
git-1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e.tar.bz2
[PATCH] cvs-migration.txt
Slightly expand the cvsimport description, and make a couple of syntax edits. The way I figure it, telling someone why cvsimport is taking so long will improve their overall user experience. :-) Signed-off-by: Tommy McGuire <mcguire@crsr.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/cvs-migration.txt')
-rw-r--r--Documentation/cvs-migration.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 6c2a450..4e2c452 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -14,7 +14,7 @@ does a lot of things differently.
One particular suckage of CVS is very hard to work around: CVS is
basically a tool for tracking _file_ history, while git is a tool for
tracking _project_ history. This sometimes causes problems if you are
-used to doign very strange things in CVS, in particular if you're doing
+used to doing very strange things in CVS, in particular if you're doing
things like making branches of just a subset of the project. Git can't
track that, since git never tracks things on the level of an individual
file, only on the whole project level.
@@ -35,8 +35,8 @@ that you're actually working in (your working directory, or your
working directories _are_ the repositories. However, you can easily
emulate the CVS model by having one special "global repository", which
people can synchronize with. See details later, but in the meantime
-just keep in mind that with git, every checked out working tree will be
-a full revision control of its own.
+just keep in mind that with git, every checked out working tree will
+have a full revision control history of its own.
Importing a CVS archive
@@ -69,10 +69,12 @@ which will do exactly what you'd think it does: it will create a git
archive of the named CVS module. The new archive will be created in a
subdirectory named <module>.
-It can take some time to actually do the conversion for a large archive,
+It can take some time to actually do the conversion for a large archive
+since it involves checking out from CVS every revision of every file,
and the conversion script can be reasonably chatty, but on some not very
scientific tests it averaged about eight revisions per second, so a
-medium-sized project should not take more than a couple of minutes.
+medium-sized project should not take more than a couple of minutes. For
+larger projects or remote repositories, the process may take longer.
Emulating CVS behaviour