From dfc85c2d0dae00f55981bd8245f467e97a917666 Mon Sep 17 00:00:00 2001
From: mhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Date: Fri, 14 Jan 2011 08:51:32 +0000
Subject: [PATCH] Make the cvs2git instructions more complete.

Part of this change was suggested by Jonathan Nieder
<jrnieder@gmail.com>.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5314 be7e6eca-30d4-0310-a8e5-ac0d63af7087
---
 www/cvs2git.html | 66 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/www/cvs2git.html b/www/cvs2git.html
index e96a41c8..08e8aeb0 100644
--- a/www/cvs2git.html
+++ b/www/cvs2git.html
@@ -288,14 +288,26 @@ make check # ...optional
 
   <li>
 
-    Configure cvs2git for your conversion.  This can be done via
+    Configure cvs2git and run the conversion.  This can be done via
     command-line options or via an options file:
 
     <ul>
 
-      <li>The command-line options for running cvs2git are documented
+      <li>
+
+	<p>The command-line options for running cvs2git are documented
         in the cvs2git man page and in the output of <tt>cvs2git
-        --help</tt>.</li>
+        --help</tt>.  For example:</p>
+
+<pre>
+cvs2git \
+    --blobfile=cvs2svn-tmp/git-blob.dat \
+    --dumpfile=cvs2svn-tmp/git-dump.dat \
+    --username=cvs2git \
+    /path/to/cvs/repo
+</pre>
+
+      </li>
 
       <li>
 
@@ -316,11 +328,7 @@ cvs2git --options=OPTIONS-FILE
 
     </ul>
 
-  </li>
-
-  <li>
-
-    <p>Run cvs2git.  This creates two output files in <a
+    <p>This creates two output files in <a
     href="http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html">git
     fast-import</a> format.  The names of these files are specified by
     your options file or command-line arguments.  In the example,
@@ -331,20 +339,30 @@ cvs2git --options=OPTIONS-FILE
 
   <li>
 
-    <p>Initialize a git repository, and load the dump files using
-      git fast-import:</p>
+    <p>Initialize a git repository:</p>
 
 <pre>
+mkdir myproject.git
+cd myproject.git
 git init
-git fast-import --export-marks=cvs2svn-tmp/git-marks.dat &lt; cvs2svn-tmp/git-blob.dat
-git fast-import --import-marks=cvs2svn-tmp/git-marks.dat &lt; cvs2svn-tmp/git-dump.dat
+</pre>
+
+  </li>
+
+  <li>
+
+    <p>Load the dump files into the new git repository using <tt>git
+      fast-import</tt>:</p>
+
+<pre>
+git fast-import --export-marks=../cvs2svn-tmp/git-marks.dat &lt; ../cvs2svn-tmp/git-blob.dat
+git fast-import --import-marks=../cvs2svn-tmp/git-marks.dat &lt; ../cvs2svn-tmp/git-dump.dat
 </pre>
 
     <p>This can, of course, be shortened to:</p>
 
 <pre>
-git init
-cat cvs2svn-tmp/git-blob.dat cvs2svn-tmp/git-dump.dat | git fast-import
+cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
 </pre>
 
   </li>
@@ -353,6 +371,26 @@ cat cvs2svn-tmp/git-blob.dat cvs2svn-tmp/git-dump.dat | git fast-import
     run the <tt>contrib/git-move-refs.py</tt> script from within the
     git repository.</li>
 
+  <li>
+
+    <p>(Optional) View the results of the conversion, for example:</p>
+
+<pre>
+gitk --all
+</pre>
+
+  </li>
+
+  <li>
+
+    <p>Check out the master branch into the working copy:</p>
+
+<pre>
+git checkout master
+</pre>
+
+  </li>
+
 </ol>
 
 <p>Feedback would be much appreciated, including reports of success
-- 
2.11.4.GIT