Johannes Schindelin escreveu:
> It really is an important concept to grasp for people coming
> from CVS. Even if it is briefly mentioned, it is not obvious
> enough to sink in.
I think the goal is laudable, but IMO it would be better to shorten
the document rather adding more text.
here is my try
>From 980a0ca1b274e1219c24c3138f95e42206c72875 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xxxxxxxxxxxx>
Date: Wed, 6 Dec 2006 15:50:13 +0100
Subject: [PATCH] another try at rephrasing cvs doc.
Signed-off-by: Han-Wen Nienhuys <hanwen@xxxxxxxxx>
---
Documentation/cvs-migration.txt | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 6812683..3270c57 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -6,24 +6,36 @@ this document is to put you on the road to recovery, by helping you
convert an existing cvs repository to git, and by showing you how to use a
git repository in a cvs-like fashion.
-Some basic familiarity with git is required. This
-link:tutorial.html[tutorial introduction to git] should be sufficient.
-
-First, note some ways that git differs from CVS:
+Git differs from CVS:
* Commits are atomic and project-wide, not per-file as in CVS.
- * Offline work is supported: you can make multiple commits locally,
+ * Branching is fast and easy.
+
+ * GIT is a distributed version control system:
+ This has several consequences:
+
+ - Every working tree contains a repository with a full copy of the
+ project history.
+
+ - Offline work is supported: you can create revisions locally,
then submit them when you're ready.
- * Branching is fast and easy.
+ Hence, there is a difference between creating a revision
+ (the "commit" command) and submitting it (the "push" command).
+
+ - No repository is inherently more important than
+ any other.
+
+ Of course, a project may still designate one central repository as
+ the True Master that contributors synchronize with.
+
+ See below for details.
- * Every working tree contains a repository with a full copy of the
- project history, and no repository is inherently more important than
- any other. However, you can emulate the CVS model by designating a
- single shared repository which people can synchronize with; see below
- for details.
+Some basic familiarity with git is required. This
+link:tutorial.html[tutorial introduction to git] should be sufficient.
+
Importing a CVS archive
-----------------------
--
1.4.4.1.gc9922-dirty
--
Han-Wen Nienhuys - hanwen@xxxxxxxxx - http://www.xs4all.nl/~hanwen
-
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