[Emacs-diffs] Changes to emacs/doc/misc/erc.texi,v

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      08/01/26 21:49:42

Index: doc/misc/erc.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/erc.texi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/misc/erc.texi   22 Jan 2008 23:53:26 -0000      1.5
+++ doc/misc/erc.texi   26 Jan 2008 21:49:41 -0000      1.6
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.2.
+This manual is for ERC version 5.3.
 
 Copyright @copyright{} 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
@@ -135,8 +135,8 @@
 locations, or from your local GNU mirror.
 
 @itemize @bullet
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.zip}
 @end itemize
 
 The rest of this chapter may be skipped if you are using the version of
@@ -169,68 +169,101 @@
 Choose the development version if you want to live on the bleeding edge
 of ERC development or try out new features before release.
 
address@hidden GNU Arch
address@hidden git version control system, using
+The git version control system allows you to keep up-to-date with the
+latest changes to the development version of ERC.  It also allows you
+to contribute changes (via commits, if you are have developer access to
+the repository, or via patches, otherwise).  If you would like to
+contribute to ERC development, it is highly recommended that you use
+git.
 
-ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
-up-to-date involves the following steps.
+If you are new to git, you might find this tutorial helpful:
address@hidden://www.kernel.org/pub/software/scm/git/docs/tutorial.html}.
+
+Downloading ERC with git and staying up-to-date involves the following
+steps.
 
 @enumerate
address@hidden GNU Arch, installing
address@hidden Install arch
address@hidden Install git.
 
 @itemize @bullet
address@hidden Debian: @kbd{apt-get install tla}.
address@hidden Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
address@hidden Debian and Ubuntu: @kbd{apt-get install git-core}.
address@hidden Windows: @uref{http://git.or.cz/gitwiki/WindowsInstall}.
address@hidden Other operating systems: download, compile, and install the 
source
+from @uref{http://www.kernel.org/pub/software/scm/git/}, or find a git
+package for your operating system.
 @end itemize
 
address@hidden GNU Arch, downloading ERC
address@hidden Register the archive.
address@hidden Download the ERC development branch.
+
+If you have developer access to ERC, do:
+
address@hidden
+git clone ssh://loginname@@git.sv.gnu.org/srv/git/erc.git
address@hidden example
+
+otherwise, do:
+
 @example
-tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
+git clone git://git.sv.gnu.org/erc.git
 @end example
 
address@hidden Download the ERC source code.
+If you are behind a restrictive firewall, and do not have developer
+access, then do the following instead:
+
 @example
-# Download ERC into the @file{erc} directory.
-tla get erc@@sv.gnu.org/erc--main--0 erc
+git clone http://git.sv.gnu.org/r/erc.git
 @end example
 
 @item List upstream changes that are missing from your local copy.
 Do this whenever you want to see whether new changes have been committed
-to ERC.
+to ERC.  If you wish, you may skip this step and proceed directly to
+the ``update'' step.
 
 @example
 # Change to the source directory you are interested in.
-cd erc/
+cd erc
+
+# Fetch new changes from the repository, but don't apply them yet
+git fetch origin
 
-# Display the summary of changes
-tla missing --summary
+# Display log messages for the new changes
+git log HEAD..origin
 @end example
 
address@hidden GNU Arch, updating ERC
address@hidden Update to the latest version by replaying missing changes.
+``origin'' is git's name for the location where you originally got ERC
+from.  You can change this location at any time by editing the
address@hidden/config} file in the directory where the ERC source was
+placed.
+
address@hidden updating ERC with git
address@hidden Update to the latest version by pulling in any missing changes.
+
 @example
 cd erc
-tla update
+git pull origin
 @end example
 
+git will show how many files changed, and will provide a visual display
+for how many lines were changed in each file.
+
 @end enumerate
 
-If you are new to Arch and want to learn more about developing ERC with
-it, visit @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment} for
-full instructions.
-
address@hidden Development snapshots
-
address@hidden development snapshot
-Alternatively, the latest development snapshot may be downloaded in both
-``.tar.gz'' and ``.zip'' forms.
+There are other ways to interact with the ERC repository.
 
address@hidden @bullet
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.zip}
address@hidden
address@hidden Browse git repo: @uref{http://git.sv.gnu.org/gitweb/?p=erc.git}
address@hidden Latest development snapshot: 
@uref{http://mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden Latest development snapshot (zip file): 
@uref{http://mwolson.org/static/dist/erc-latest.zip}
 @end itemize
 
+The latest development snapshot can lag behind the git repo by as much
+as 20 minutes, but never more than that.
+
+For further information on committing changes to ERC and performing
+development, please consult
address@hidden://emacswiki.org/cgi-bin/wiki/ErcDevelopment}.
+
 
 @node Installation, Getting Started, Obtaining ERC, Top
 @comment  node-name,  next,  previous,  up
@@ -1009,6 +1042,10 @@
 @uref{http://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
 our revision control system.  Our mailing list address changed as well.
 
address@hidden 2007
+
+We switched to using git for our version control system.
+
 @end itemize
 
 @node Copying, GNU Free Documentation License, History, Top