This patch is autogenerated by a rule in the userland Makefile for

mercurial.  We already patch a handful of help files (via rst.patch), and

change the rst plugin to emit manpages intelligible to Solaris nroff (via

hgmanpage.patch), but docutils is required to actually rebuild the manpages

after those changes are made.  Since we don't yet ship docutils, we have to

create this patch offline and keep a copy of it in the repo.

These changes are Solaris-specific and not appropriate for upstream.

@@ -3,33 +3,6 @@

 .TH HG 1 "" "" "Mercurial Manual"

 .SH NAME

 hg \- Mercurial source code management system

-.

-.nr rst2man-indent-level 0

-.

-.de1 rstReportMargin

-\\$1 \\n[an-margin]

-level \\n[rst2man-indent-level]

-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]

--

-\\n[rst2man-indent0]

-\\n[rst2man-indent1]

-\\n[rst2man-indent2]

-..

-.de1 INDENT

-.\" .rstReportMargin pre:

-. RS \\$1

-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]

-. nr rst2man-indent-level +1

-.\" .rstReportMargin post:

-..

-.de UNINDENT

-. RE

-.\" indent \\n[an-margin]

-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.nr rst2man-indent-level -1

-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u

-..

 .SH SYNOPSIS

 .sp

 \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...

@@ -38,12 +11,12 @@

 The \fBhg\fP command provides a command line interface to the Mercurial

 system.

 .SH COMMAND ELEMENTS

-.INDENT 0.0

+.RS 0

 .TP

 .B files...

 .

 indicates one or more filename or relative path filenames; see

-\%File Name Patterns\: for information on pattern matching

+File Name Patterns for information on pattern matching

 .TP

 .B path

 .

@@ -59,9 +32,9 @@

 .

 either the pathname of a local repository or the URI of a remote

 repository.

-.UNINDENT

+.RE

 .SH OPTIONS

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-R,  \-\-repository \ <REPO>

 .

@@ -85,7 +58,7 @@

 .TP

 .BI \-\-config \ <CONFIG[+]>

 .

-set/override config option (use \(aqsection.name=value\(aq)

+set/override config option (use 'section.name=value')

 .TP

 .B \-\-debug

 .

@@ -126,7 +99,7 @@

 .B \-\-hidden

 .

 consider hidden changesets

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SH COMMANDS

@@ -135,9 +108,9 @@

 add the specified files on the next commit:

 .sp

 .nf

-.ft C

+.ft

 hg add [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Schedule files to be version controlled and added to the

@@ -144,22 +117,22 @@

 repository.

 .sp

 The files will be added to the repository at the next commit. To

-undo an add before that, see \%\fBhg forget\fP\:.

+undo an add before that, see \fBhg forget\fP.

 .sp

 If no names are given, add all files to the repository (except

 files matching \fB.hgignore\fP).

 .sp

 Examples:

-.INDENT 0.0

-.INDENT 3.5

-.INDENT 0.0

+.RS 0

+.RS 3

+.RS 0

 .IP \(bu 2

 .

 New (unknown) files are added

-automatically by \%\fBhg add\fP\::

+automatically by \fBhg add\fP:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 foo.c

 $ hg status

@@ -168,7 +141,7 @@

 adding foo.c

 $ hg status

 A foo.c

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -175,7 +148,7 @@

 Specific files to be added can be specified:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 bar.c  foo.c

 $ hg status

@@ -185,16 +158,16 @@

 $ hg status

 A bar.c

 ? foo.c

-.ft P

+.ft

 .fi

-.UNINDENT

-.UNINDENT

-.UNINDENT

+.RE

+.RE

+.RE

 .sp

 Returns 0 if all files are successfully added.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-I,  \-\-include \ <PATTERN[+]>

 .

@@ -211,7 +184,7 @@

 .B \-n,  \-\-dry\-run

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS addremove

@@ -219,9 +192,9 @@

 add all new files, delete all missing files:

 .sp

 .nf

-.ft C

+.ft

 hg addremove [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Add all new files and remove all missing files from the

@@ -236,23 +209,23 @@

 be identical) as its parameter. With a parameter greater than 0,

 this compares every removed file with every added file and records

 those similar enough as renames. Detecting renamed files this way

-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be

+can be expensive. After using this option, \fBhg status \-C\fP can be

 used to check which files were identified as moved or renamed. If

 not specified, \-s/\-\-similarity defaults to 100 and only renames of

 identical files are detected.

 .sp

 Examples:

-.INDENT 0.0

-.INDENT 3.5

-.INDENT 0.0

+.RS 0

+.RS 3

+.RS 0

 .IP \(bu 2

 .

 A number of files (bar.c and foo.c) are new,

-while foobar.c has been removed (without using \%\fBhg remove\fP\:)

+while foobar.c has been removed (without using \fBhg remove\fP)

 from the repository:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 bar.c foo.c

 $ hg status

@@ -267,15 +240,15 @@

 A bar.c

 A foo.c

 R foobar.c

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

-A file foobar.c was moved to foo.c without using \%\fBhg rename\fP\:.

+A file foobar.c was moved to foo.c without using \fBhg rename\fP.

 Afterwards, it was edited slightly:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 foo.c

 $ hg status

@@ -289,16 +262,16 @@

 A foo.c

   foobar.c

 R foobar.c

-.ft P

+.ft

 .fi

-.UNINDENT

-.UNINDENT

-.UNINDENT

+.RE

+.RE

+.RE

 .sp

 Returns 0 if all files are successfully added.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-s,  \-\-similarity \ <SIMILARITY>

 .

@@ -319,7 +292,7 @@

 .B \-n,  \-\-dry\-run

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS annotate

@@ -327,9 +300,9 @@

 show changeset information by line for each file:

 .sp

 .nf

-.ft C

+.ft

 hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...

-.ft P

+.ft

 .fi

 .sp

 List changes in files, showing the revision id responsible for

@@ -349,7 +322,7 @@

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-r,  \-\-rev \ <REV>

 .

@@ -361,7 +334,7 @@

 .TP

 .B \-\-no\-follow

 .

-don\(aqt follow copies and renames

+don't follow copies and renames

 .TP

 .B \-a,  \-\-text

 .

@@ -414,23 +387,23 @@

 .BI \-T,  \-\-template \ <TEMPLATE>

 .

 display with template (EXPERIMENTAL)

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

-.INDENT 0.0

-.INDENT 3.5

+.RS 0

+.RS 3

 .sp

 aliases: blame

-.UNINDENT

-.UNINDENT

+.RE

+.RE

 .SS archive

 .sp

 create an unversioned archive of a repository revision:

 .sp

 .nf

-.ft C

+.ft

 hg archive [OPTION]... DEST

-.ft P

+.ft

 .fi

 .sp

 By default, the revision used is the parent of the working

@@ -440,15 +413,15 @@

 extension (to override, use \-t/\-\-type).

 .sp

 Examples:

-.INDENT 0.0

+.RS 0

 .IP \(bu 2

 .

 create a zip file containing the 1.0 release:

 .sp

 .nf

-.ft C

+.ft

 hg archive \-r 1.0 project\-1.0.zip

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -455,14 +428,14 @@

 create a tarball excluding .hg files:

 .sp

 .nf

-.ft C

+.ft

 hg archive project.tar.gz \-X ".hg*"

-.ft P

+.ft

 .fi

-.UNINDENT

+.RE

 .sp

 Valid types are:

-.INDENT 0.0

+.RS 0

 .TP

 .B \fBfiles\fP

 .sp

@@ -487,10 +460,10 @@

 .B \fBzip\fP

 .sp

 zip archive, compressed using deflate

-.UNINDENT

+.RE

 .sp

 The exact name of the destination archive or directory is given

-using a format string; see \%\fBhg help export\fP\: for details.

+using a format string; see \fBhg help export\fP for details.

 .sp

 Each member added to an archive file has a directory prefix

 prepended. Use \-p/\-\-prefix to specify a format string for the

@@ -500,7 +473,7 @@

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-\-no\-decode

 .

@@ -529,7 +502,7 @@

 .BI \-X,  \-\-exclude \ <PATTERN[+]>

 .

 exclude names matching the given patterns

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS backout

@@ -537,9 +510,9 @@

 reverse effect of earlier changeset:

 .sp

 .nf

-.ft C

+.ft

 hg backout [OPTION]... [\-r] REV

-.ft P

+.ft

 .fi

 .sp

 Prepare a new changeset with the effect of REV undone in the

@@ -550,12 +523,12 @@

 is committed automatically (unless \-\-no\-commit is specified).

 .IP Note

 .

-\%\fBhg backout\fP\: cannot be used to fix either an unwanted or

+\fBhg backout\fP cannot be used to fix either an unwanted or

 incorrect merge.

 .RE

 .sp

 Examples:

-.INDENT 0.0

+.RS 0

 .IP \(bu 2

 .

 Reverse the effect of the parent of the working directory.

@@ -562,9 +535,9 @@

 This backout will be committed immediately:

 .sp

 .nf

-.ft C

+.ft

 hg backout \-r .

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -571,9 +544,9 @@

 Reverse the effect of previous bad revision 23:

 .sp

 .nf

-.ft C

+.ft

 hg backout \-r 23

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -581,12 +554,12 @@

 leave changes uncommitted:

 .sp

 .nf

-.ft C

+.ft

 hg backout \-r 23 \-\-no\-commit

 hg commit \-m "Backout revision 23"

-.ft P

+.ft

 .fi

-.UNINDENT

+.RE

 .sp

 By default, the pending changeset will have one parent,

 maintaining a linear history. With \-\-merge, the pending

@@ -594,13 +567,13 @@

 working directory and a new child of REV that simply undoes REV.

 .sp

 Before version 1.7, the behavior without \-\-merge was equivalent

-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to

+to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to

 cancel the merge and leave the child of REV as a head to be

 merged separately.

 .sp

-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.

+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.

 .sp

-See \%\fBhg help revert\fP\: for a way to restore files to the state

+See \fBhg help revert\fP for a way to restore files to the state

 of another revision.

 .sp

 Returns 0 on success, 1 if nothing to backout or there are unresolved

@@ -607,7 +580,7 @@

 files.

 .sp

 Options: