aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/man1/cvs.114
-rw-r--r--man/man1/hg.1115
2 files changed, 124 insertions, 5 deletions
diff --git a/man/man1/cvs.1 b/man/man1/cvs.1
index 0bafab65..029f3edd 100644
--- a/man/man1/cvs.1
+++ b/man/man1/cvs.1
@@ -4,11 +4,11 @@ cvs \- introduction using plan9port CVS repository
.SH SYNOPSIS
.B cvs
.B -d
-.B :pserver:anoncvs@cvs.pdos.lcs.mit.edu:/cvs login
+.B :pserver:anoncvs@cvs.pdos.csail.mit.edu:/cvs login
.PP
.B cvs
.B -d
-.B :pserver:anoncvs@cvs.pdos.lcs.mit.edu:/cvs checkout plan9
+.B :pserver:anoncvs@cvs.pdos.csail.mit.edu:/cvs checkout plan9
.PP
.B cvs
.B update
@@ -43,12 +43,14 @@ cvs \- introduction using plan9port CVS repository
]
.PP
.B web
-.B http://cvs.pdos.lcs.mit.edu/cvs/plan9/
+.B http://cvs.pdos.csail.mit.edu/cvs/plan9/
.SH DESCRIPTION
The master source tree for Plan 9 from User Space is maintained
using the source control system CVS
as a poor substitute for Plan 9's
\fIreplica\fR(8) and dump file system.
+(It is maintained simultaneously using Mercurial; see
+.IR hg (1).)
.PP
The first argument to
.I cvs
@@ -179,7 +181,7 @@ command first to create your
file.
.PP
The CVS tree can be inspected on the web at
-.HR http://cvs.pdos.lcs.mit.edu/cvs/plan9/ "" .
+.HR http://cvs.pdos.csail.mit.edu/cvs/plan9/ "" .
.SH EXAMPLES
Incorporate any changes made to the CVS tree since
the last check out or update:
@@ -233,11 +235,13 @@ directory containing CVS metadata for parent
.B .cvsignore
list of files and wildcards to exclude from CVS operations in this directory
.SH SEE ALSO
+.IR hg (1)
+.PP
Unix's
\fIcvs\fR(1),
.HR http://www.cvshome.org/
.PP
-.HR http://cvs.pdos.lcs.mit.edu/cvs/plan9/
+.HR http://cvs.pdos.csail.mit.edu/cvs/plan9/
.SH BUGS
The CVS server is a read-only public copy of a private tree.
The dates on versions reflect the date the changes were made in the
diff --git a/man/man1/hg.1 b/man/man1/hg.1
new file mode 100644
index 00000000..7b59d923
--- /dev/null
+++ b/man/man1/hg.1
@@ -0,0 +1,115 @@
+.TH HG 1
+.SH NAME
+hg \- introduction to using plan9port Mercurial repository
+.SH SYNOPSIS
+.B hg
+.B clone
+.B http://hg.pdos.csail.mit.edu/hg/plan9
+.B plan9
+.PP
+.B hg
+.B pull
+.B -u
+.PP
+.B hg
+.B diff
+[
+.B -r
+.I revision
+]
+[
+.I path ...
+]
+.PP
+.B hg
+.B serve
+.PP
+.B hg
+.B view
+.PP
+.B web
+.B http://hg.pdos.csail.mit.edu/hg/plan9/
+.SH DESCRIPTION
+The master source tree for Plan 9 from User Space is maintained
+using the source control system Mercurial
+as a substitute for Plan 9's
+\fIreplica\fR(8) and dump file system.
+(It is maintained simultaneously using CVS; see
+.IR cvs (1).)
+.PP
+The first argument to
+.I hg
+is a command, which determines the form of the rest of the command line.
+.PP
+The
+.B clone
+command downloads a copy of the tree into the directory
+.BR plan9 ,
+which it will create.
+After
+.B hg
+.BR clone ,
+the other commands listed
+should be run within the
+.B plan9
+directory tree.
+.PP
+Unlike CVS, Mercurial downloads the entire revision history
+of Plan 9 from User Space
+in addition to the current tree.
+.PP
+.I Hg
+.I pull
+incorporates changes from the master repository
+into the local revision history.
+The
+.B -u
+flag applies these changes to the current file tree.
+.PP
+.I Hg
+.I diff
+runs Unix's
+.IR diff (1)
+to compare the files in the local tree with the corresponding
+files in the revision history.
+By default it compares against the version that was most recently
+incorporated into the local tree.
+The
+.B -r
+flag specifies an alternate version to compare against.
+The special revision
+.B tip
+refers to the most recent version on the server.
+.PP
+.I Hg
+.I serve
+starts an HTTP server serving information about
+the local repository at the address
+.BR http://localhost:8000/ .
+.PP
+.I Hg
+.I view
+starts an interactive history viewer.
+.PP
+The Mercurial tree can be inspected on the web at
+.HR http://hg.pdos.csail.mit.edu/hg/plan9/ "" .
+.SH FILES
+.TP
+.B \*9/.hg
+directory containing Mercurial local repository
+.TP
+.B .hgignore
+list of files and wildcards to exclude from Mercurial operations
+.SH SEE ALSO
+.IR cvs (1)
+.PP
+Unix's
+\fIhg\fR(1),
+.HR http://www.selenic.com/mercurial/wiki/
+.PP
+.HR http://hg.pdos.csail.mit.edu/hg/plan9/
+.SH BUGS
+The use of Mercurial for accessing Plan 9 from User Space
+should be considered experimental.
+People uncomfortable with Mercurial should continue to use
+.IR cvs (1).