CVS-like push-pull description update.

- Yes, push does not lock, but that does not mean it is not
meant for multi-user repository.  It just ought to perform
correctly without using locks.

- Let's not pretend we know _the_ right way.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index d582aa0a215c54bc8a9b3656160ff819f86b574d..8db1409e43fde99938b3134e09e033eb54d7cbdc 100644 (file)
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -111,17 +111,15 @@ repository of this person public, and make every team member
 pull regularly from it.
 
 2. Set up a public repository with read/write access for every team
 pull regularly from it.
 
 2. Set up a public repository with read/write access for every team

-member. Use "git pull/push" as you used "cvs update/commit". Beware!
-Linus says that "git push" does no locking, since it was not meant
-for multi-user repositories!
+member. Use "git pull/push" as you used "cvs update/commit".  Be
+sure that your repository is up to date before pushing, just
+like you used to do with "cvs commit"; your push will fail if
+what you are pushing is not up to date.

 
 3. Make the repository of every team member public. It is the
 responsibility of each single member to pull from every other
 team member.
 
 
 3. Make the repository of every team member public. It is the
 responsibility of each single member to pull from every other
 team member.
 

-4. Read Documentation/tutorial.txt and admit that the described work
-flow is the best.
-

 
 CVS annotate
 ------------
 
 CVS annotate
 ------------