[Savannah-cvs] [611] collect instructions on CVS import in one place

[ineiev]

Revision: 611
          
http://svn.savannah.gnu.org/viewvc/?view=rev&root=administration&revision=611
Author:   ineiev
Date:     2023-05-05 12:36:16 -0400 (Fri, 05 May 2023)
Log Message:
-----------
collect instructions on CVS import in one place

Modified Paths:
--------------
    trunk/sviki/UsingGit.mdwn

Modified: trunk/sviki/UsingGit.mdwn
===================================================================
--- trunk/sviki/UsingGit.mdwn   2023-05-05 16:19:48 UTC (rev 610)
+++ trunk/sviki/UsingGit.mdwn   2023-05-05 16:36:16 UTC (rev 611)
@@ -233,6 +233,25 @@
 Importing from CVS
 ------------------
 
+First thing you may want to do is to tag the state of your CVS
+repository and declare it as closed. For example:
+
+    $ cd my-checked-out-cvs-repository
+    $ cvs tag cvs-repository-moved-to-git
+
+On your group page, activate git. For example the libcdio group the
+URL for the group page is:
+
+    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=libcdio
+
+"activated" is in the second column and the "git" row is midway down the
+page. If you forget to do this or git is not active, you may get a
+message like this:
+
+    Pushing to rocky@git.sv.gnu.org:/srv/git/libcdio.git
+    fatal: '/srv/git/libcdio.git': unable to chdir or not a git archive
+    fatal: The remote end hung up unexpectedly
+
 Git comes with the tool, `git-cvsimport` which will import a CVS
 repository into a new git repository. You may want to use this for
 converting your existing CVS repository to a new git repository.
@@ -263,6 +282,41 @@
 commit history: copying down each version of each file and then
 performing essentially `git-commit` for every CVS commit.
 
+This will create a local git repository with at least two branches:
+
+    $ git show-branch -a
+    * [master] Moved from CVS to GIT.
+     ! [origin] Moved from CVS to GIT.
+    --
+    *+ [master] Moved from CVS to GIT.
+
+Before pushing this to your Savannah group page you might want to
+rename or remove that "origin" branch. It has the same state and history
+as the master branch so you won't lose any information. (Footnote:
+Normally the origin branch is used by developers who prefer to use git
+while working on groups that only run a central CVS repository. They
+do their work on "master" but track the changes in the CVS repository in
+the "origin" branch.) This is not what you are going to do anyway and
+unfortunately "origin" is also the default alias name for remote git
+repositories and thus it may lead to unnecessary confusion. You can
+remove the branch like this:
+
+    $ git branch -d origin
+
+Don't worry! If you ever need to recreate that branch you can always do
+so by branching off at that last CVS commit and call the branch
+"origin", "cvs" or "back-in-the-dark-ages".
+
+Now you are ready to push this git repository to your Savannah group
+page using the instructions under
+[[Pushing a Newly-Created, Existing, or Converted Git 
Repository|UsingGit#pushing-new]].
+
+If you have converted from a different version control repository to
+git then consider disabling commits to the previous location so as to
+prevent confusing history creation.
+
+* [[CvsDisabling]]
+
 Importing from SVN
 ------------------
 
@@ -328,65 +382,8 @@
 Importing from CVS
 ------------------
 
-First thing you may want to do is to tag the state of your CVS
-repository and declare it as closed. For example:
 
-    $ cd my-checked-out-cvs-repository
-    $ cvs tag cvs-repository-moved-to-git
-
-On your group page, activate git. For example the libcdio group the
-URL for the group page is:
-
-    https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=libcdio
-
-"activated" is in the second column and the "git" row is midway down the
-page. If you forget to do this or git is not active, you may get a
-message like this:
-
-    Pushing to rocky@git.sv.gnu.org:/srv/git/libcdio.git
-    fatal: '/srv/git/libcdio.git': unable to chdir or not a git archive
-    fatal: The remote end hung up unexpectedly
-
-After this done create a local git repository on your computer, using
-the instructions under [Importing from
-CVS](http://savannah.gnu.org/maintenance/UsingGit#importing-from-cvs).
-This will take a while and it will create a local git repository with at
-least two branches:
-
-    $ git show-branch -a
-    * [master] Moved from CVS to GIT.
-     ! [origin] Moved from CVS to GIT.
-    --
-    *+ [master] Moved from CVS to GIT.
-
-Before pushing this to your Savannah group page you might want to
-rename or remove that "origin" branch. It has the same state and history
-as the master branch so you won't lose any information. (Footnote:
-Normally the origin branch is used by developers who prefer to use git
-while working on groups that only run a central CVS repository. They
-do their work on "master" but track the changes in the CVS repository in
-the "origin" branch.) This is not what you are going to do anyway and
-unfortunately "origin" is also the default alias name for remote git
-repositories and thus it may lead to unnecessary confusion. You can
-remove the branch like this:
-
-    $ git branch -d origin
-
-Don't worry! If you ever need to recreate that branch you can always do
-so by branching off at that last CVS commit and call the branch
-"origin", "cvs" or "back-in-the-dark-ages".
-
-Now you are ready to push this git repository to your Savannah group
-page using the instructions under [Pushing a Newly-Created, Existing, or
-Converted Git
-Repository](http://savannah.gnu.org/maintenance/UsingGit#pushing-a-newly-created-existing-or-converted-git-repository).
-
-If you have converted from a different version control repository to
-git then consider disabling commits to the previous location so as to
-prevent confusing history creation.
-
-* [[CvsDisabling]]
-
+<a id="pushing-new">
 Pushing a Newly-Created, Existing, or Converted Git Repository
 --------------------------------------------------------------
 
@@ -496,7 +493,11 @@
 * How does a group admin update the "description" file for the web
   interface?
 
-  Please visit the 'Administer' link in the Git submenu.
+  Unfortunately nothing has been implemented to allow the group
+  administrator to do this from the web interface.  Fortunately this
+  doesn't need to change very often.  Please submit a
+  [support 
request](https://savannah.gnu.org/support/?func=additem&group=administration)
+  and a Savannah Admin will happily make the changes for you.
 
 * Similarly, how can a group admin update the "HEAD" file to point
   to another branch?