manpages.patch revision 400
196N/A--- mercurial-1.8.2/doc/hg.1 Fri Apr 1 10:42:06 2011
196N/A+++ mercurial-1.8.2/doc/hg.1 Fri Apr 1 11:18:00 2011
196N/A@@ -1,35 +1,9 @@
196N/A+'\" t
196N/A .\" Man page generated from reStructeredText.
196N/A .
196N/A .TH HG 1 "" "" "Mercurial Manual"
196N/A .SH NAME
196N/A hg \- Mercurial source code management system
196N/A-.
196N/A-.nr rst2man-indent-level 0
196N/A-.
196N/A-.de1 rstReportMargin
196N/A-\\$1 \\n[an-margin]
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A--
196N/A-\\n[rst2man-indent0]
196N/A-\\n[rst2man-indent1]
196N/A-\\n[rst2man-indent2]
196N/A-..
196N/A-.de1 INDENT
196N/A-.\" .rstReportMargin pre:
196N/A-. RS \\$1
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-..
196N/A-.de UNINDENT
196N/A-. RE
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.nr rst2man-indent-level -1
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A-..
196N/A .SH SYNOPSIS
196N/A .sp
196N/A \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...
196N/A@@ -43,7 +17,7 @@
196N/A .B files...
196N/A .
196N/A indicates one or more filename or relative path filenames; see
196N/A-\%File Name Patterns\: for information on pattern matching
196N/A+File Name Patterns for information on pattern matching
196N/A .TP
196N/A .B path
196N/A .
196N/A@@ -73,7 +47,7 @@
196N/A .TP
196N/A .B \-y, \-\-noninteractive
196N/A .
196N/A-do not prompt, assume \(aqyes\(aq for any required answers
196N/A+do not prompt, assume 'yes' for any required answers
196N/A .TP
196N/A .B \-q, \-\-quiet
196N/A .
196N/A@@ -85,7 +59,7 @@
196N/A .TP
196N/A .B \-\-config
196N/A .
196N/A-set/override config option (use \(aqsection.name=value\(aq)
196N/A+set/override config option (use 'section.name=value')
196N/A .TP
196N/A .B \-\-debug
196N/A .
196N/A@@ -127,9 +101,9 @@
196N/A .SS add
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg add [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Schedule files to be version controlled and added to the
196N/A@@ -136,15 +110,15 @@
196N/A repository.
196N/A .sp
196N/A The files will be added to the repository at the next commit. To
196N/A-undo an add before that, see \%\fBhg forget\fP\:.
196N/A+undo an add before that, see \fBhg forget\fP.
196N/A .sp
196N/A If no names are given, add all files to the repository.
196N/A .sp
196N/A An example showing how new (unknown) files are added
196N/A-automatically by \%\fBhg add\fP\::
196N/A+automatically by \fBhg add\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ ls
196N/A foo.c
196N/A $ hg status
196N/A@@ -153,7 +127,7 @@
196N/A adding foo.c
196N/A $ hg status
196N/A A foo.c
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 if all files are successfully added.
196N/A@@ -180,9 +154,9 @@
196N/A .SS addremove
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg addremove [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Add all new files and remove all missing files from the
196N/A@@ -197,7 +171,7 @@
196N/A every added file and records those similar enough as renames. This
196N/A option takes a percentage between 0 (disabled) and 100 (files must
196N/A be identical) as its parameter. Detecting renamed files this way
196N/A-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be
196N/A+can be expensive. After using this option, \fBhg status \-C\fP can be
196N/A used to check which files were identified as moved or renamed.
196N/A .sp
196N/A Returns 0 if all files are successfully added.
196N/A@@ -224,9 +198,9 @@
196N/A .SS annotate
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A List changes in files, showing the revision id responsible for
196N/A@@ -255,7 +229,7 @@
196N/A .TP
196N/A .B \-\-no\-follow
196N/A .
196N/A-don\(aqt follow copies and renames
196N/A+don't follow copies and renames
196N/A .TP
196N/A .B \-a, \-\-text
196N/A .
196N/A@@ -298,9 +272,9 @@
196N/A .SS archive
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg archive [OPTION]... DEST
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A By default, the revision used is the parent of the working
196N/A@@ -338,7 +312,7 @@
196N/A .UNINDENT
196N/A .sp
196N/A The exact name of the destination archive or directory is given
196N/A-using a format string; see \%\fBhg help export\fP\: for details.
196N/A+using a format string; see \fBhg help export\fP for details.
196N/A .sp
196N/A Each member added to an archive file has a directory prefix
196N/A prepended. Use \-p/\-\-prefix to specify a format string for the
196N/A@@ -381,9 +355,9 @@
196N/A .SS backout
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg backout [OPTION]... [\-r] REV
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Prepare a new changeset with the effect of REV undone in the
196N/A@@ -399,11 +373,11 @@
196N/A directory and a new child of REV that simply undoes REV.
196N/A .sp
196N/A Before version 1.7, the behavior without \-\-merge was equivalent to
196N/A-specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to cancel
196N/A+specifying \-\-merge followed by \fBhg update \-\-clean .\fP to cancel
196N/A the merge and leave the child of REV as a head to be merged
196N/A separately.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -453,9 +427,9 @@
196N/A .SS bisect
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This command helps to find changesets which introduce problems. To
196N/A@@ -508,23 +482,23 @@
196N/A .SS bookmarks
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg bookmarks [\-f] [\-d] [\-m NAME] [\-r REV] [NAME]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Bookmarks are pointers to certain commits that move when
196N/A committing. Bookmarks are local. They can be renamed, copied and
196N/A-deleted. It is possible to use bookmark names in \%\fBhg merge\fP\: and
196N/A-\%\fBhg update\fP\: to merge and update respectively to a given bookmark.
196N/A+deleted. It is possible to use bookmark names in \fBhg merge\fP and
196N/A+\fBhg update\fP to merge and update respectively to a given bookmark.
196N/A .sp
196N/A-You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working
196N/A-directory\(aqs parent revision with the given name. If you specify
196N/A+You can use \fBhg bookmark NAME\fP to set a bookmark on the working
196N/A+directory's parent revision with the given name. If you specify
196N/A a revision using \-r REV (where REV may be an existing bookmark),
196N/A the bookmark is assigned to that revision.
196N/A .sp
196N/A-Bookmarks can be pushed and pulled between repositories (see \%\fBhg help
196N/A-push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote
196N/A+Bookmarks can be pushed and pulled between repositories (see \fBhg help
196N/A+push\fP and \fBhg help pull\fP). This requires both the local and remote
196N/A repositories to support bookmarks. For versions prior to 1.8, this means
196N/A the bookmarks extension must be enabled.
196N/A .sp
196N/A@@ -550,26 +524,26 @@
196N/A .SS branch
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg branch [\-fC] [NAME]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With no argument, show the current branch name. With one argument,
196N/A set the working directory branch name (the branch will not exist
196N/A in the repository until the next commit). Standard practice
196N/A-recommends that primary development take place on the \(aqdefault\(aq
196N/A+recommends that primary development take place on the 'default'
196N/A branch.
196N/A .sp
196N/A Unless \-f/\-\-force is specified, branch will not let you set a
196N/A-branch name that already exists, even if it\(aqs inactive.
196N/A+branch name that already exists, even if it's inactive.
196N/A .sp
196N/A Use \-C/\-\-clean to reset the working directory branch to that of
196N/A the parent of the working directory, negating a previous branch
196N/A change.
196N/A .sp
196N/A-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use
196N/A-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed.
196N/A+Use the command \fBhg update\fP to switch to an existing branch. Use
196N/A+\fBhg commit \-\-close\-branch\fP to mark this branch as closed.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -587,19 +561,19 @@
196N/A .SS branches
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg branches [\-ac]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-List the repository\(aqs named branches, indicating which ones are
196N/A+List the repository's named branches, indicating which ones are
196N/A inactive. If \-c/\-\-closed is specified, also list branches which have
196N/A-been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:).
196N/A+been marked closed (see \fBhg commit \-\-close\-branch\fP).
196N/A .sp
196N/A If \-a/\-\-active is specified, only show active branches. A branch
196N/A is considered active if it contains repository heads.
196N/A .sp
196N/A-Use the command \%\fBhg update\fP\: to switch to an existing branch.
196N/A+Use the command \fBhg update\fP to switch to an existing branch.
196N/A .sp
196N/A Returns 0.
196N/A .sp
196N/A@@ -617,9 +591,9 @@
196N/A .SS bundle
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg bundle [\-f] [\-t TYPE] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Generate a compressed changegroup file collecting changesets not
196N/A@@ -686,9 +660,9 @@
196N/A .SS cat
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg cat [OPTION]... FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print the specified files as they were at the given revision. If
196N/A@@ -706,7 +680,7 @@
196N/A .TP
196N/A .B \fB%d\fP
196N/A .sp
196N/A-dirname of file being printed, or \(aq.\(aq if in repository root
196N/A+dirname of file being printed, or '.' if in repository root
196N/A .TP
196N/A .B \fB%p\fP
196N/A .sp
196N/A@@ -741,9 +715,9 @@
196N/A .SS clone
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg clone [OPTION]... SOURCE [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Create a copy of an existing repository in a new directory.
196N/A@@ -751,14 +725,14 @@
196N/A If no destination directory name is specified, it defaults to the
196N/A basename of the source.
196N/A .sp
196N/A-The location of the source is added to the new repository\(aqs
196N/A+The location of the source is added to the new repository's
196N/A \fB.hg/hgrc\fP file, as the default to be used for future pulls.
196N/A .sp
196N/A-See \%\fBhg help urls\fP\: for valid source format details.
196N/A+See \fBhg help urls\fP for valid source format details.
196N/A .sp
196N/A It is possible to specify an \fBssh://\fP URL as the destination, but no
196N/A \fB.hg/hgrc\fP and working directory will be created on the remote side.
196N/A-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP URLs.
196N/A+Please see \fBhg help urls\fP for important details about \fBssh://\fP URLs.
196N/A .sp
196N/A A set of changesets (tags, or branch names) to pull may be specified
196N/A by listing each changeset (tag, or branch name) with \-r/\-\-rev.
196N/A@@ -769,7 +743,7 @@
196N/A No subsequent changesets (including subsequent tags) will be present
196N/A in the destination.
196N/A .sp
196N/A-Using \-r/\-\-rev (or \(aqclone src#rev dest\(aq) implies \-\-pull, even for
196N/A+Using \-r/\-\-rev (or 'clone src#rev dest') implies \-\-pull, even for
196N/A local source repositories.
196N/A .sp
196N/A For efficiency, hardlinks are used for cloning whenever the source
196N/A@@ -783,9 +757,9 @@
196N/A using full hardlinks with
196N/A .sp
196N/A .nf
196N/A-.ft C
99N/A-$ cp \-al REPO REPOCLONE
196N/A-.ft P
196N/A+.ft
99N/A+$ /usr/gnu/bin/cp \-al REPO REPOCLONE
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This is the fastest way to clone, but it is not always safe. The
196N/A@@ -804,7 +778,7 @@
196N/A .IP b. 3
196N/A .
196N/A if \-u . and the source repository is local, the first parent of
196N/A-the source repository\(aqs working directory
196N/A+the source repository's working directory
196N/A .IP c. 3
196N/A .
196N/A the changeset specified with \-u (if a branch name, this means the
196N/A@@ -870,16 +844,16 @@
196N/A .SS commit
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg commit [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Commit changes to the given files into the repository. Unlike a
196N/A centralized SCM, this operation is a local operation. See
196N/A-\%\fBhg push\fP\: for a way to actively distribute your changes.
196N/A+\fBhg push\fP for a way to actively distribute your changes.
196N/A .sp
196N/A-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
196N/A+If a list of files is omitted, all changes reported by \fBhg status\fP
196N/A will be committed.
196N/A .sp
196N/A If you are committing the result of a merge, do not provide any
196N/A@@ -890,7 +864,7 @@
196N/A commit fails, you will find a backup of your message in
196N/A \fB.hg/last\-message.txt\fP.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Returns 0 on success, 1 if nothing changed.
196N/A .sp
196N/A@@ -934,9 +908,9 @@
196N/A .SS copy
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg copy [OPTION]... [SOURCE]... DEST
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Mark dest as having copies of source files. If dest is a
196N/A@@ -948,7 +922,7 @@
196N/A operation is recorded, but no copying is performed.
196N/A .sp
196N/A This command takes effect with the next commit. To undo a copy
196N/A-before that, see \%\fBhg revert\fP\:.
196N/A+before that, see \fBhg revert\fP.
196N/A .sp
196N/A Returns 0 on success, 1 if errors are encountered.
196N/A .sp
196N/A@@ -980,9 +954,9 @@
196N/A .SS diff
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg diff [OPTION]... ([\-c REV] | [\-r REV1 [\-r REV2]]) [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show differences between revisions for the specified files.
196N/A@@ -991,7 +965,7 @@
196N/A .IP Note
196N/A .
196N/A diff may generate unexpected results for merges, as it will
196N/A-default to comparing against the working directory\(aqs first
196N/A+default to comparing against the working directory's first
196N/A parent changeset if no revisions are specified.
99N/A .RE
99N/A .sp
196N/A@@ -1009,7 +983,7 @@
196N/A anyway, probably with undesirable results.
196N/A .sp
196N/A Use the \-g/\-\-git option to generate diffs in the git extended diff
196N/A-format. For more information, read \%\fBhg help diffs\fP\:.
196N/A+format. For more information, read \fBhg help diffs\fP.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -1079,9 +1053,9 @@
196N/A .SS export
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg export [OPTION]... [\-o OUTFILESPEC] REV...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print the changeset header and diffs for one or more revisions.
196N/A@@ -1138,7 +1112,7 @@
196N/A diff anyway, probably with undesirable results.
196N/A .sp
196N/A Use the \-g/\-\-git option to generate diffs in the git extended diff
196N/A-format. See \%\fBhg help diffs\fP\: for more information.
196N/A+format. See \fBhg help diffs\fP for more information.
196N/A .sp
196N/A With the \-\-switch\-parent option, the diff will be against the
196N/A second parent. It can be useful to review a merge.
196N/A@@ -1175,9 +1149,9 @@
196N/A .SS forget
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg forget [OPTION]... FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Mark the specified files so they will no longer be tracked
196N/A@@ -1187,7 +1161,7 @@
196N/A entire project history, and it does not delete them from the
196N/A working directory.
196N/A .sp
196N/A-To undo a forget before the next commit, see \%\fBhg add\fP\:.
196N/A+To undo a forget before the next commit, see \fBhg add\fP.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -1205,9 +1179,9 @@
196N/A .SS grep
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg grep [OPTION]... PATTERN [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Search revisions of files for a regular expression.
196N/A@@ -1275,9 +1249,9 @@
196N/A .SS heads
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg heads [\-ac] [\-r STARTREV] [REV]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With no arguments, show all repository branch heads.
196N/A@@ -1291,7 +1265,7 @@
196N/A associated with the specified changesets are shown.
196N/A .sp
196N/A If \-c/\-\-closed is specified, also show branch heads marked closed
196N/A-(see \%\fBhg commit \-\-close\-branch\fP\:).
196N/A+(see \fBhg commit \-\-close\-branch\fP).
196N/A .sp
196N/A If STARTREV is specified, only those heads that are descendants of
196N/A STARTREV will be displayed.
196N/A@@ -1331,9 +1305,9 @@
196N/A .SS help
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg help [TOPIC]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With no arguments, print a list of commands with short help messages.
196N/A@@ -1345,9 +1319,9 @@
196N/A .SS identify
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg identify [\-nibtB] [\-r REV] [SOURCE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With no revision, print a summary of the current state of the
196N/A@@ -1395,9 +1369,9 @@
196N/A .SS import
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg import [OPTION]... PATCH...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Import a list of patches and commit them individually (unless
196N/A@@ -1413,7 +1387,7 @@
196N/A text/plain body parts before first diff are added to commit
196N/A message.
196N/A .sp
196N/A-If the imported patch was generated by \%\fBhg export\fP\:, user and
196N/A+If the imported patch was generated by \fBhg export\fP, user and
196N/A description from patch override values from message headers and
196N/A body. Values given on command line with \-m/\-\-message and \-u/\-\-user
196N/A override these.
196N/A@@ -1425,11 +1399,11 @@
196N/A deficiencies in the text patch format.
196N/A .sp
196N/A With \-s/\-\-similarity, hg will attempt to discover renames and
196N/A-copies in the patch in the same way as \(aqaddremove\(aq.
196N/A+copies in the patch in the same way as 'addremove'.
196N/A .sp
196N/A To read a patch from standard input, use "\-" as the patch name. If
196N/A a URL is specified, the patch will be downloaded from it.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -1450,7 +1424,7 @@
196N/A .TP
196N/A .B \-\-no\-commit
196N/A .
196N/A-don\(aqt commit, just update the working directory
196N/A+don't commit, just update the working directory
196N/A .TP
196N/A .B \-\-exact
196N/A .
196N/A@@ -1485,9 +1459,9 @@
196N/A .SS incoming
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show new changesets found in the specified path/URL or the default
196N/A@@ -1577,9 +1551,9 @@
196N/A .SS init
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg init [\-e CMD] [\-\-remotecmd CMD] [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Initialize a new repository in the given directory. If the given
196N/A@@ -1588,7 +1562,7 @@
196N/A If no directory is given, the current directory is used.
196N/A .sp
196N/A It is possible to specify an \fBssh://\fP URL as the destination.
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+See \fBhg help urls\fP for more information.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -1610,9 +1584,9 @@
196N/A .SS locate
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg locate [OPTION]... [PATTERN]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print files under Mercurial control in the working directory whose
196N/A@@ -1658,9 +1632,9 @@
196N/A .SS log
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg log [OPTION]... [FILE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print the revision history of the specified files or the entire
196N/A@@ -1675,9 +1649,9 @@
196N/A If no revision range is specified, the default is \fBtip:0\fP unless
196N/A \-\-follow is set, in which case the working directory parent is
196N/A used as the starting revision. You can specify a revision set for
196N/A-log, see \%\fBhg help revsets\fP\: for more information.
196N/A+log, see \fBhg help revsets\fP for more information.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A By default this command prints revision number and changeset id,
196N/A tags, non\-trivial parents, user, date and time, and a summary for
196N/A@@ -1785,9 +1759,9 @@
196N/A .SS manifest
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg manifest [\-r REV]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print a list of version controlled files for the given revision.
196N/A@@ -1809,9 +1783,9 @@
196N/A .SS merge
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg merge [\-P] [\-f] [[\-r] REV]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The current working directory is updated with all changes made in
196N/A@@ -1826,14 +1800,14 @@
196N/A merges. It overrides the HGMERGE environment variable and your
196N/A configuration files.
196N/A .sp
196N/A-If no revision is specified, the working directory\(aqs parent is a
196N/A+If no revision is specified, the working directory's parent is a
196N/A head revision, and the current branch contains exactly one other
196N/A head, the other head is merged with by default. Otherwise, an
196N/A explicit revision with which to merge with must be provided.
196N/A .sp
196N/A-\%\fBhg resolve\fP\: must be used to resolve unresolved files.
196N/A+\fBhg resolve\fP must be used to resolve unresolved files.
196N/A .sp
196N/A-To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
196N/A+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
196N/A will check out a clean copy of the original merge parent, losing
196N/A all changes.
196N/A .sp
196N/A@@ -1861,9 +1835,9 @@
196N/A .SS outgoing
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show changesets not found in the specified destination repository
196N/A@@ -1946,12 +1920,12 @@
196N/A .SS parents
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg parents [\-r REV] [FILE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-Print the working directory\(aqs parent revisions. If a revision is
196N/A+Print the working directory's parent revisions. If a revision is
196N/A given via \-r/\-\-rev, the parent of that revision will be printed.
196N/A If a file argument is given, the revision in which the file was
196N/A last changed (before the working directory revision or the
196N/A@@ -1977,9 +1951,9 @@
196N/A .SS paths
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg paths [NAME]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show definition of symbolic path name NAME. If no name is given,
196N/A@@ -1997,18 +1971,18 @@
196N/A as the fallback for both. When cloning a repository, the clone
196N/A source is written as \fBdefault\fP in \fB.hg/hgrc\fP. Note that
196N/A \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
196N/A-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and
196N/A-\%\fBhg bundle\fP\:) operations.
196N/A+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and
196N/A+\fBhg bundle\fP) operations.
196N/A .sp
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+See \fBhg help urls\fP for more information.
196N/A .sp
196N/A Returns 0 on success.
196N/A .SS pull
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Pull changes from a remote repository to a local one.
196N/A@@ -2018,13 +1992,13 @@
196N/A \-R is specified). By default, this does not update the copy of the
196N/A project in the working directory.
196N/A .sp
196N/A-Use \%\fBhg incoming\fP\: if you want to see what would have been added
196N/A+Use \fBhg incoming\fP if you want to see what would have been added
196N/A by a pull at the time you issued this command. If you then decide
196N/A-to add those changes to the repository, you should use \%\fBhg pull
196N/A-\-r X\fP\: where \fBX\fP is the last changeset listed by \%\fBhg incoming\fP\:.
196N/A+to add those changes to the repository, you should use \fBhg pull
196N/A+\-r X\fP where \fBX\fP is the last changeset listed by \fBhg incoming\fP.
196N/A .sp
196N/A-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+If SOURCE is omitted, the 'default' path will be used.
196N/A+See \fBhg help urls\fP for more information.
196N/A .sp
196N/A Returns 0 on success, 1 if an update had unresolved files.
196N/A .sp
196N/A@@ -2066,9 +2040,9 @@
196N/A .SS push
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Push changesets from the local repository to the specified
196N/A@@ -2092,7 +2066,7 @@
196N/A If \-r/\-\-rev is used, the specified revision and all its ancestors
196N/A will be pushed to the remote repository.
196N/A .sp
196N/A-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
196N/A+Please see \fBhg help urls\fP for important details about \fBssh://\fP
196N/A URLs. If DESTINATION is omitted, a default path will be used.
196N/A .sp
196N/A Returns 0 if push was successful, 1 if nothing to push.
196N/A@@ -2135,9 +2109,9 @@
196N/A .SS recover
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg recover
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Recover from an interrupted commit or pull.
196N/A@@ -2150,9 +2124,9 @@
196N/A .SS remove
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg remove [OPTION]... FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Schedule the indicated files for removal from the repository.
196N/A@@ -2166,21 +2140,21 @@
196N/A The following table details the behavior of remove for different
196N/A file states (columns) and option combinations (rows). The file
196N/A states are Added [A], Clean [C], Modified [M] and Missing [!] (as
196N/A-reported by \%\fBhg status\fP\:). The actions are Warn, Remove (from
196N/A+reported by \fBhg status\fP). The actions are Warn, Remove (from
196N/A branch) and Delete (from disk):
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A A C M !
196N/A none W RD W R
196N/A \-f R RD RD R
196N/A \-A W W W R
196N/A \-Af R R R R
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This command schedules the files to be removed at the next commit.
196N/A-To undo a remove before that, see \%\fBhg revert\fP\:.
196N/A+To undo a remove before that, see \fBhg revert\fP.
196N/A .sp
196N/A Returns 0 on success, 1 if any warnings encountered.
196N/A .sp
196N/A@@ -2208,9 +2182,9 @@
196N/A .SS rename
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg rename [OPTION]... SOURCE... DEST
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Mark dest as copies of sources; mark sources for deletion. If dest
196N/A@@ -2222,7 +2196,7 @@
196N/A operation is recorded, but no copying is performed.
196N/A .sp
196N/A This command takes effect at the next commit. To undo a rename
196N/A-before that, see \%\fBhg revert\fP\:.
196N/A+before that, see \fBhg revert\fP.
196N/A .sp
196N/A Returns 0 on success, 1 if errors are encountered.
196N/A .sp
196N/A@@ -2254,9 +2228,9 @@
196N/A .SS resolve
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg resolve [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Merges with unresolved conflicts are often the result of
196N/A@@ -2263,7 +2237,7 @@
196N/A non\-interactive merging using the \fBinternal:merge\fP configuration
196N/A setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
196N/A command is used to manage the files involved in a merge, after
196N/A-\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the
196N/A+\fBhg merge\fP has been run, and before \fBhg commit\fP is run (i.e. the
196N/A working directory must have two parents).
196N/A .sp
196N/A The resolve command can be used in the following ways:
196N/A@@ -2270,7 +2244,7 @@
196N/A .INDENT 0.0
196N/A .IP \(bu 2
196N/A .
196N/A-\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified
196N/A+\fBhg resolve [\-\-tool TOOL] FILE...\fP: attempt to re\-merge the specified
196N/A files, discarding any previous merge attempts. Re\-merging is not
196N/A performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
196N/A to selects all unresolved files. \fB\-\-tool\fP can be used to specify
196N/A@@ -2278,21 +2252,21 @@
196N/A environment variable and your configuration files.
196N/A .IP \(bu 2
196N/A .
196N/A-\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
196N/A+\fBhg resolve \-m [FILE]\fP: mark a file as having been resolved
196N/A (e.g. after having manually fixed\-up the files). The default is
196N/A to mark all unresolved files.
196N/A .IP \(bu 2
196N/A .
196N/A-\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The
196N/A+\fBhg resolve \-u [FILE]...\fP: mark a file as unresolved. The
196N/A default is to mark all resolved files.
196N/A .IP \(bu 2
196N/A .
196N/A-\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts.
196N/A+\fBhg resolve \-l\fP: list files which had or still have conflicts.
196N/A In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
196N/A .UNINDENT
196N/A .sp
196N/A Note that Mercurial will not let you commit files with unresolved
196N/A-merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
196N/A+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can
196N/A commit after a conflicting merge.
196N/A .sp
196N/A Returns 0 on success, 1 if any files fail a resolve attempt.
196N/A@@ -2335,9 +2309,9 @@
196N/A .SS revert
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg revert [OPTION]... [\-r REV] [NAME]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP Note
196N/A .
196N/A@@ -2344,8 +2318,8 @@
196N/A This command is most likely not what you are looking for.
196N/A Revert will partially overwrite content in the working
196N/A directory without changing the working directory parents. Use
196N/A-\%\fBhg update \-r rev\fP\: to check out earlier revisions, or
196N/A-\%\fBhg update \-\-clean .\fP\: to undo a merge which has added another
196N/A+\fBhg update \-r rev\fP to check out earlier revisions, or
196N/A+\fBhg update \-\-clean .\fP to undo a merge which has added another
196N/A parent.
99N/A .RE
196N/A .sp
196N/A@@ -2358,8 +2332,8 @@
196N/A .sp
196N/A Using the \-r/\-\-rev option, revert the given files or directories
196N/A to their contents as of a specific revision. This can be helpful
196N/A-to "roll back" some or all of an earlier change. See \%\fBhg help
196N/A-dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+to "roll back" some or all of an earlier change. See \fBhg help
196N/A+dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Revert modifies the working directory. It does not commit any
196N/A changes, or change the parent of the working directory. If you
196N/A@@ -2412,9 +2386,9 @@
196N/A .SS rollback
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg rollback
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This command should be used with care. There is only one level of
196N/A@@ -2464,9 +2438,9 @@
196N/A .SS root
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg root
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print the root directory of the current repository.
196N/A@@ -2475,9 +2449,9 @@
196N/A .SS serve
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg serve [OPTION]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Start a local HTTP repository browser and pull server. You can use
196N/A@@ -2571,9 +2545,9 @@
196N/A .SS showconfig
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg showconfig [\-u] [NAME]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With no arguments, print names and values of all config items.
196N/A@@ -2601,9 +2575,9 @@
196N/A .SS status
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg status [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show status of files in the repository. If names are given, only
196N/A@@ -2631,7 +2605,7 @@
196N/A The codes used to show the status of files are:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A M = modified
196N/A A = added
196N/A R = removed
196N/A@@ -2640,7 +2614,7 @@
196N/A ? = not tracked
196N/A I = ignored
196N/A = origin of the previous file listed as A (added)
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -2717,9 +2691,9 @@
196N/A .SS summary
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg summary [\-\-remote]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This generates a brief summary of the working directory state,
196N/A@@ -2742,9 +2716,9 @@
196N/A .SS tag
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg tag [\-f] [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Name a particular revision using <name>.
196N/A@@ -2765,11 +2739,11 @@
196N/A repositories).
196N/A .sp
196N/A Tag commits are usually made at the head of a branch. If the parent
196N/A-of the working directory is not a branch head, \%\fBhg tag\fP\: aborts; use
196N/A+of the working directory is not a branch head, \fBhg tag\fP aborts; use
196N/A \-f/\-\-force to force the tag commit to be based on a non\-head
196N/A changeset.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Since tag names have priority over branch names during revision
196N/A lookup, using an existing branch name as a tag name is discouraged.
196N/A@@ -2814,9 +2788,9 @@
196N/A .SS tags
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg tags
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This lists both regular and local tags. When the \-v/\-\-verbose
196N/A@@ -2826,9 +2800,9 @@
196N/A .SS tip
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg tip [\-p] [\-g]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The tip revision (usually just called the tip) is the changeset
196N/A@@ -2864,9 +2838,9 @@
196N/A .SS unbundle
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg unbundle [\-u] FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Apply one or more compressed changegroup files generated by the
196N/A@@ -2884,16 +2858,16 @@
196N/A .SS update
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-Update the repository\(aqs working directory to the specified
196N/A+Update the repository's working directory to the specified
196N/A changeset. If no changeset is specified, update to the tip of the
196N/A current named branch.
196N/A .sp
196N/A-If the changeset is not a descendant of the working directory\(aqs
196N/A+If the changeset is not a descendant of the working directory's
196N/A parent, the update is aborted. With the \-c/\-\-check option, the
196N/A working directory is checked for uncommitted changes; if none are
196N/A found, the working directory is updated to the specified
196N/A@@ -2906,7 +2880,7 @@
196N/A .
196N/A If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if
196N/A the requested changeset is an ancestor or descendant of
196N/A-the working directory\(aqs parent, the uncommitted changes
196N/A+the working directory's parent, the uncommitted changes
196N/A are merged into the requested changeset and the merged
196N/A result is left uncommitted. If the requested changeset is
196N/A not an ancestor or descendant (that is, it is on another
196N/A@@ -2923,12 +2897,12 @@
196N/A .UNINDENT
196N/A .sp
196N/A Use null as the changeset to remove the working directory (like
196N/A-\%\fBhg clone \-U\fP\:).
196N/A+\fBhg clone \-U\fP).
196N/A .sp
196N/A If you want to update just one file to an older changeset, use
196N/A-\%\fBhg revert\fP\:.
196N/A+\fBhg revert\fP.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Returns 0 on success, 1 if there are unresolved files.
196N/A .sp
196N/A@@ -2956,14 +2930,14 @@
196N/A .SS verify
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg verify
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Verify the integrity of the current repository.
196N/A .sp
196N/A-This will perform an extensive check of the repository\(aqs
196N/A+This will perform an extensive check of the repository's
196N/A integrity, validating the hashes and checksums of each entry in
196N/A the changelog, manifest, and tracked files, as well as the
196N/A integrity of their crosslinks and indices.
196N/A@@ -2972,9 +2946,9 @@
196N/A .SS version
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg version
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A output version and copyright information
196N/A@@ -3040,9 +3014,9 @@
196N/A the active user, Mercurial will warn you that the file is skipped:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If this bothers you, the warning can be silenced (the file would still
196N/A@@ -3065,11 +3039,11 @@
196N/A and followed by \fBname = value\fP entries:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [ui]
196N/A username = Firstname Lastname <firstname.lastname@example.net>
196N/A verbose = True
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The above entries will be referred to as \fBui.username\fP and
196N/A@@ -3081,7 +3055,7 @@
196N/A on Unix\-like systems: \fBman hgrc\fP
196N/A .IP \(bu 2
196N/A .
196N/A-online: \%http://www.selenic.com/mercurial/hgrc.5.html\:
196N/A+online: http://www.selenic.com/mercurial/hgrc.5.html
196N/A .UNINDENT
196N/A .SH DATE FORMATS
196N/A .sp
196N/A@@ -3138,7 +3112,7 @@
196N/A \fB12/6/6\fP (Dec 6 2006)
196N/A .UNINDENT
196N/A .sp
196N/A-Lastly, there is Mercurial\(aqs internal format:
196N/A+Lastly, there is Mercurial's internal format:
196N/A .INDENT 0.0
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3197,17 +3171,17 @@
196N/A Plain examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A path:foo/bar a name bar in a directory named foo in the root
196N/A of the repository
196N/A path:path:name a file or directory named "path:name"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Glob examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A glob:*.c any name ending in ".c" in the current directory
196N/A *.c any name ending in ".c" in the current directory
196N/A **.c any name ending in ".c" in any subdirectory of the
196N/A@@ -3215,24 +3189,24 @@
196N/A foo/*.c any name ending in ".c" in the directory foo
196N/A foo/**.c any name ending in ".c" in any subdirectory of foo
196N/A including itself.
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Regexp examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A re:.*\e.c$ any name ending in ".c", anywhere in the repository
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A File examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A listfile:list.txt read list from list.txt with one file pattern per line
196N/A listfile0:list.txt read list from list.txt with null byte delimiters
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SH ENVIRONMENT VARIABLES
196N/A .INDENT 0.0
196N/A@@ -3239,10 +3213,10 @@
196N/A .TP
196N/A .B HG
196N/A .
196N/A-Path to the \(aqhg\(aq executable, automatically passed when running
196N/A+Path to the 'hg' executable, automatically passed when running
196N/A hooks, extensions or external tools. If unset or empty, this is
196N/A-the hg executable\(aqs name if it\(aqs frozen, or an executable named
196N/A-\(aqhg\(aq (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
196N/A+the hg executable's name if it's frozen, or an executable named
196N/A+\'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
196N/A Windows) is searched.
196N/A .TP
196N/A .B HGEDITOR
196N/A@@ -3260,9 +3234,9 @@
196N/A .TP
196N/A .B HGENCODINGMODE
196N/A .
196N/A-This sets Mercurial\(aqs behavior for handling unknown characters
196N/A+This sets Mercurial's behavior for handling unknown characters
196N/A while transcoding user input. The default is "strict", which
196N/A-causes Mercurial to abort if it can\(aqt map a character. Other
196N/A+causes Mercurial to abort if it can't map a character. Other
196N/A settings include "replace", which replaces unknown characters, and
196N/A "ignore", which drops them. This setting can be overridden with
196N/A the \-\-encodingmode command\-line option.
196N/A@@ -3269,7 +3243,7 @@
196N/A .TP
196N/A .B HGENCODINGAMBIGUOUS
196N/A .
196N/A-This sets Mercurial\(aqs behavior for handling characters with
196N/A+This sets Mercurial's behavior for handling characters with
196N/A "ambiguous" widths like accented Latin characters with East Asian
196N/A fonts. By default, Mercurial assumes ambiguous characters are
196N/A narrow, set this variable to "wide" if such characters cause
196N/A@@ -3294,7 +3268,7 @@
196N/A .INDENT 7.0
196N/A .IP \(bu 2
196N/A .
196N/A-if it\(aqs a directory, all files ending with .rc are added
196N/A+if it's a directory, all files ending with .rc are added
196N/A .IP \(bu 2
196N/A .
196N/A otherwise, the file itself will be added
196N/A@@ -3303,7 +3277,7 @@
196N/A .B HGPLAIN
196N/A .
196N/A When set, this disables any configuration settings that might
196N/A-change Mercurial\(aqs default output. This includes encoding,
196N/A+change Mercurial's default output. This includes encoding,
196N/A defaults, verbose mode, debug mode, quiet mode, tracebacks, and
196N/A localization. This can be useful when scripting against Mercurial
196N/A in the face of existing user configuration.
196N/A@@ -3354,7 +3328,7 @@
196N/A editor it uses is determined by looking at the environment
196N/A variables HGEDITOR, VISUAL and EDITOR, in that order. The first
196N/A non\-empty one is chosen. If all of them are empty, the editor
196N/A-defaults to \(aqvi\(aq.
196N/A+defaults to 'vi'.
196N/A .TP
196N/A .B PYTHONPATH
196N/A .
196N/A@@ -3422,7 +3396,7 @@
196N/A .sp
196N/A Special characters can be used in quoted identifiers by escaping them,
196N/A e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
196N/A-interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
196N/A+interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
196N/A .sp
196N/A There is a single prefix operator:
196N/A .INDENT 0.0
196N/A@@ -3468,10 +3442,10 @@
196N/A .\" predicatesmarker
196N/A .
196N/A .sp
196N/A-Command line equivalents for \%\fBhg log\fP\::
196N/A+Command line equivalents for \fBhg log\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A \-f \-> ::.
196N/A \-d x \-> date(x)
196N/A \-k x \-> keyword(x)
196N/A@@ -3480,7 +3454,7 @@
196N/A \-b x \-> branch(x)
196N/A \-P x \-> !::x
196N/A \-l x \-> limit(expr, x)
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Some sample queries:
196N/A@@ -3490,9 +3464,9 @@
196N/A Changesets on the default branch:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg log \-r "branch(default)"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3499,9 +3473,9 @@
196N/A Changesets on the default branch since tag 1.5 (excluding merges):
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg log \-r "branch(default) and 1.5:: and not merge()"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3508,9 +3482,9 @@
196N/A Open branch heads:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg log \-r "head() and not closed()"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3518,9 +3492,9 @@
196N/A \fBhgext/*\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A-hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)"
196N/A-.ft P
196N/A+.ft
196N/A+hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')"
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3527,9 +3501,9 @@
196N/A Changesets in committed May 2008, sorted by user:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A-hg log \-r "sort(date(\(aqMay 2008\(aq), user)"
196N/A-.ft P
196N/A+.ft
196N/A+hg log \-r "sort(date('May 2008'), user)"
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A@@ -3537,14 +3511,14 @@
196N/A release:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .UNINDENT
196N/A .SH DIFF FORMATS
196N/A .sp
196N/A-Mercurial\(aqs default format for showing changes between two versions of
196N/A+Mercurial's default format for showing changes between two versions of
196N/A a file is compatible with the unified format of GNU diff, which can be
196N/A used by GNU patch and many other standard tools.
196N/A .sp
196N/A@@ -3571,15 +3545,15 @@
196N/A format.
196N/A .sp
196N/A This means that when generating diffs from a Mercurial repository
196N/A-(e.g. with \%\fBhg export\fP\:), you should be careful about things like file
196N/A+(e.g. with \fBhg export\fP), you should be careful about things like file
196N/A copies and renames or other things mentioned above, because when
196N/A applying a standard diff to a different repository, this extra
196N/A-information is lost. Mercurial\(aqs internal operations (like push and
196N/A+information is lost. Mercurial's internal operations (like push and
196N/A pull) are not affected by this, because they use an internal binary
196N/A format for communicating changes.
196N/A .sp
196N/A To make Mercurial produce the git extended diff format, use the \-\-git
196N/A-option available for many commands, or set \(aqgit = True\(aq in the [diff]
196N/A+option available for many commands, or set 'git = True' in the [diff]
196N/A section of your configuration file. You do not need to set this option
196N/A when importing diffs in this format or using them in the mq extension.
196N/A .SH MERGE TOOLS
196N/A@@ -3591,8 +3565,8 @@
196N/A ancestor of the two file versions, so they can determine the changes
196N/A made on both branches.
196N/A .sp
196N/A-Merge tools are used both for \%\fBhg resolve\fP\:, \%\fBhg merge\fP\:, \%\fBhg update\fP\:,
196N/A-\%\fBhg backout\fP\: and in several extensions.
196N/A+Merge tools are used both for \fBhg resolve\fP, \fBhg merge\fP, \fBhg update\fP,
196N/A+\fBhg backout\fP and in several extensions.
196N/A .sp
196N/A Usually, the merge tool tries to automatically reconcile the files by
196N/A combining all non\-overlapping changes that occurred separately in
196N/A@@ -3700,7 +3674,7 @@
196N/A .IP Note
196N/A .
196N/A After selecting a merge program, Mercurial will by default attempt
196N/A-to merge the files using a simple merge algorithm first. Only if it doesn\(aqt
196N/A+to merge the files using a simple merge algorithm first. Only if it doesn't
196N/A succeed because of conflicting changes Mercurial will actually execute the
196N/A merge program. Whether to use the simple merge algorithm first can be
196N/A controlled by the premerge setting of the merge tool. Premerge is enabled by
196N/A@@ -3725,9 +3699,9 @@
196N/A Usage:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ hg log \-r1 \-\-style changelog
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A A template is a piece of text, with markup to invoke variable
196N/A@@ -3734,10 +3708,10 @@
196N/A expansion:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ hg log \-r1 \-\-template "{node}\en"
196N/A b56ce7b07c52de7d5fd79fb89701ea538af65746
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Strings in curly braces are called keywords. The availability of
196N/A@@ -3834,15 +3808,15 @@
196N/A The "date" keyword does not produce human\-readable output. If you
196N/A want to use a date in your output, you can use a filter to process
196N/A it. Filters are functions which return a string based on the input
196N/A-variable. Be sure to use the stringify filter first when you\(aqre
196N/A+variable. Be sure to use the stringify filter first when you're
196N/A applying a string\-input filter to a list\-like input variable.
196N/A You can also use a chain of filters to get the desired output:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ hg tip \-\-template "{date|isodate}\en"
196N/A 2008\-08\-21 18:22 +0000
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A List of filters:
196N/A@@ -3911,7 +3885,7 @@
196N/A .TP
196N/A .B nonempty
196N/A .
196N/A-Any text. Returns \(aq(none)\(aq if the string is empty.
196N/A+Any text. Returns '(none)' if the string is empty.
196N/A .TP
196N/A .B hgdate
196N/A .
196N/A@@ -3989,24 +3963,24 @@
196N/A Valid URLs are of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A local/filesystem/path[#revision]
196N/A file://local/filesystem/path[#revision]
196N/A http://[user[:pass]@]host[:port]/[path][#revision]
196N/A https://[user[:pass]@]host[:port]/[path][#revision]
196N/A ssh://[user@]host[:port]/[path][#revision]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Paths in the local filesystem can either point to Mercurial
196N/A-repositories or to bundle files (as created by \%\fBhg bundle\fP\: or :hg:\(ga
196N/A-incoming \-\-bundle\(ga). See also \%\fBhg help paths\fP\:.
196N/A+repositories or to bundle files (as created by \fBhg bundle\fP or :hg:\(ga
196N/A+incoming \-\-bundle\(ga). See also \fBhg help paths\fP.
196N/A .sp
196N/A An optional identifier after # indicates a particular branch, tag, or
196N/A-changeset to use from the remote repository. See also \%\fBhg help
196N/A-revisions\fP\:.
196N/A+changeset to use from the remote repository. See also \fBhg help
196N/A+revisions\fP.
196N/A .sp
196N/A-Some features, such as pushing to \%http://\: and \%https://\: URLs are only
196N/A+Some features, such as pushing to http:// and https:// URLs are only
196N/A possible if the feature is explicitly enabled on the remote Mercurial
196N/A server.
196N/A .sp
196N/A@@ -4021,26 +3995,26 @@
196N/A and a copy of hg in the remote path or specified with as remotecmd.
196N/A .IP \(bu 2
196N/A .
196N/A-path is relative to the remote user\(aqs home directory by default. Use
196N/A+path is relative to the remote user's home directory by default. Use
196N/A an extra slash at the start of a path to specify an absolute path:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A ssh://example.com//tmp/repository
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP \(bu 2
196N/A .
196N/A-Mercurial doesn\(aqt use its own compression via SSH; the right thing
196N/A+Mercurial doesn't use its own compression via SSH; the right thing
196N/A to do is to configure it in your ~/.ssh/config, e.g.:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A Host *.mylocalnetwork.example.com
196N/A Compression no
196N/A Host *
196N/A Compression yes
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Alternatively specify "ssh \-C" as your ssh command in your
196N/A@@ -4051,16 +4025,16 @@
196N/A aliases under the [paths] section like so:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [paths]
196N/A alias1 = URL1
196N/A alias2 = URL2
196N/A \&...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can then use the alias for any command that uses a URL (for
196N/A-example \%\fBhg pull alias1\fP\: will be treated as \%\fBhg pull URL1\fP\:).
196N/A+example \fBhg pull alias1\fP will be treated as \fBhg pull URL1\fP).
196N/A .sp
196N/A Two path aliases are special because they are used as defaults when
196N/A you do not provide the URL to a command:
196N/A@@ -4069,14 +4043,14 @@
196N/A .B default:
196N/A .
196N/A When you create a repository with hg clone, the clone command saves
196N/A-the location of the source repository as the new repository\(aqs
196N/A-\(aqdefault\(aq path. This is then used when you omit path from push\- and
196N/A+the location of the source repository as the new repository's
196N/A+\'default' path. This is then used when you omit path from push\- and
196N/A pull\-like commands (including incoming and outgoing).
196N/A .TP
196N/A .B default\-push:
196N/A .
196N/A-The push command will look for a path named \(aqdefault\-push\(aq, and
196N/A-prefer it over \(aqdefault\(aq if both are defined.
196N/A+The push command will look for a path named 'default\-push', and
196N/A+prefer it over 'default' if both are defined.
196N/A .UNINDENT
196N/A .SH USING ADDITIONAL FEATURES
196N/A .sp
196N/A@@ -4098,19 +4072,19 @@
196N/A like this:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A foo =
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You may also specify the full path to an extension:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A myfeature = ~/.hgext/myfeature.py
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A To explicitly disable an extension enabled in a configuration file of
196N/A@@ -4117,13 +4091,13 @@
196N/A broader scope, prepend its path with !:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A # disabling extension bar residing in /path/to/extension/bar.py
196N/A bar = !/path/to/extension/bar.py
196N/A # ditto, but no path was supplied for extension baz
196N/A baz = !
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A disabled extensions:
196N/A@@ -4189,7 +4163,7 @@
196N/A .TP
196N/A .B inotify
196N/A .
196N/A-accelerate status report using Linux\(aqs inotify service
196N/A+accelerate status report using Linux's inotify service
196N/A .TP
196N/A .B interhg
196N/A .
196N/A@@ -4287,7 +4261,7 @@
196N/A .INDENT 3.0
196N/A .INDENT 3.5
196N/A .sp
196N/A-path/to/nested = \%https://example.com/nested/repo/path\:
196N/A+path/to/nested = https://example.com/nested/repo/path
196N/A .UNINDENT
196N/A .UNINDENT
196N/A .sp
196N/A@@ -4362,7 +4336,7 @@
196N/A their state and finally committing it in the parent
196N/A repository. Mercurial can be made to abort if any subrepository
196N/A content is modified by setting "ui.commitsubrepos=no" in a
196N/A-configuration file (see \%\fBhg help config\fP\:).
196N/A+configuration file (see \fBhg help config\fP).
196N/A .TP
196N/A .B diff
196N/A .
196N/A@@ -4386,7 +4360,7 @@
196N/A .B pull
196N/A .
196N/A pull is not recursive since it is not clear what to pull prior
196N/A-to running \%\fBhg update\fP\:. Listing and retrieving all
196N/A+to running \fBhg update\fP. Listing and retrieving all
196N/A subrepositories changes referenced by the parent repository pulled
196N/A changesets is expensive at best, impossible in the Subversion
196N/A case.
196N/A@@ -4423,7 +4397,7 @@
196N/A hgrc(5) for more details.
196N/A .SH CONFIGURING HGWEB
196N/A .sp
196N/A-Mercurial\(aqs internal web server, hgweb, can serve either a single
196N/A+Mercurial's internal web server, hgweb, can serve either a single
196N/A repository, or a collection of them. In the latter case, a special
196N/A configuration file can be used to specify the repository paths to use
196N/A and global web configuration options.
196N/A@@ -4447,7 +4421,7 @@
196N/A .UNINDENT
196N/A .sp
196N/A The \fBweb\fP section can specify all the settings described in the web
196N/A-section of the hgrc(5) documentation. See \%\fBhg help config\fP\: for
196N/A+section of the hgrc(5) documentation. See \fBhg help config\fP\: for
196N/A information on where to find the manual page.
196N/A .sp
196N/A The \fBpaths\fP section provides mappings of physical repository
196N/A@@ -4454,7 +4428,7 @@
196N/A paths to virtual ones. For instance:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [paths]
196N/A projects/a = /foo/bar
196N/A projects/b = /baz/quux
196N/A@@ -4461,7 +4435,7 @@
196N/A web/root = /real/root/*
196N/A / = /real/root2/*
196N/A virtual/root2 = /real/root2/**
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .INDENT 0.0
196N/A .IP \(bu 2
196N/A@@ -4470,14 +4444,14 @@
196N/A appear under the same directory in the web interface
196N/A .IP \(bu 2
196N/A .
196N/A-The third entry maps every Mercurial repository found in \(aq/real/root\(aq
196N/A-into \(aqweb/root\(aq. This format is preferred over the [collections] one,
196N/A+The third entry maps every Mercurial repository found in '/real/root'
196N/A+into 'web/root'. This format is preferred over the [collections] one,
196N/A since using absolute paths as configuration keys is not supported on every
196N/A platform (especially on Windows).
196N/A .IP \(bu 2
196N/A .
196N/A The fourth entry is a special case mapping all repositories in
196N/A-\(aq/real/root2\(aq in the root of the virtual directory.
196N/A+\'/real/root2' in the root of the virtual directory.
196N/A .IP \(bu 2
196N/A .
196N/A The fifth entry recursively finds all repositories under the real
196N/A@@ -4489,10 +4463,10 @@
196N/A preferred. For instance:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [collections]
196N/A /foo = /foo
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Here, the left side will be stripped off all repositories found in the
196N/A@@ -4507,15 +4481,15 @@
196N/A changesets from a given changeset. More precisely, the ancestors
196N/A of a changeset can be defined by two properties: a parent of a
196N/A changeset is an ancestor, and a parent of an ancestor is an
196N/A-ancestor. See also: \(aqDescendant\(aq.
196N/A+ancestor. See also: 'Descendant'.
196N/A .TP
196N/A .B Branch
196N/A .
196N/A (Noun) A child changeset that has been created from a parent that
196N/A is not a head. These are known as topological branches, see
196N/A-\(aqBranch, topological\(aq. If a topological branch is named, it becomes
196N/A+\'Branch, topological'. If a topological branch is named, it becomes
196N/A a named branch. If a topological branch is not named, it becomes
196N/A-an anonymous branch. See \(aqBranch, anonymous\(aq and \(aqBranch, named\(aq.
196N/A+an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
196N/A .sp
196N/A Branches may be created when changes are pulled from or pushed to
196N/A a remote repository, since new heads may be created by these
196N/A@@ -4530,7 +4504,7 @@
196N/A (Verb) The action of creating a child changeset which results in
196N/A its parent having more than one child.
196N/A .sp
196N/A-Example: "I\(aqm going to branch at X".
196N/A+Example: "I'm going to branch at X".
196N/A .TP
196N/A .B Branch, anonymous
196N/A .
196N/A@@ -4549,19 +4523,19 @@
196N/A .TP
196N/A .B Branch head
196N/A .
196N/A-See \(aqHead, branch\(aq.
196N/A+See 'Head, branch'.
196N/A .TP
196N/A .B Branch, inactive
196N/A .
196N/A If a named branch has no topological heads, it is considered to be
196N/A inactive. As an example, a feature branch becomes inactive when it
196N/A-is merged into the default branch. The \%\fBhg branches\fP\: command
196N/A+is merged into the default branch. The \fBhg branches\fP command
196N/A shows inactive branches by default, though they can be hidden with
196N/A-\%\fBhg branches \-\-active\fP\:.
196N/A+\fBhg branches \-\-active\fP.
196N/A .sp
196N/A NOTE: this concept is deprecated because it is too implicit.
196N/A-Branches should now be explicitly closed using \%\fBhg commit
196N/A-\-\-close\-branch\fP\: when they are no longer needed.
196N/A+Branches should now be explicitly closed using \fBhg commit
196N/A+\-\-close\-branch\fP when they are no longer needed.
196N/A .TP
196N/A .B Branch, named
196N/A .
196N/A@@ -4568,8 +4542,8 @@
196N/A A collection of changesets which have the same branch name. By
196N/A default, children of a changeset in a named branch belong to the
196N/A same named branch. A child can be explicitly assigned to a
196N/A-different branch. See \%\fBhg help branch\fP\:, \%\fBhg help branches\fP\: and
196N/A-\%\fBhg commit \-\-close\-branch\fP\: for more information on managing
196N/A+different branch. See \fBhg help branch\fP, \fBhg help branches\fP and
196N/A+\fBhg commit \-\-close\-branch\fP for more information on managing
196N/A branches.
196N/A .sp
196N/A Named branches can be thought of as a kind of namespace, dividing
196N/A@@ -4582,7 +4556,7 @@
196N/A .TP
196N/A .B Branch tip
196N/A .
196N/A-See \(aqTip, branch\(aq.
196N/A+See 'Tip, branch'.
196N/A .TP
196N/A .B Branch, topological
196N/A .
196N/A@@ -4632,24 +4606,24 @@
196N/A revision. This use should probably be avoided where possible, as
196N/A changeset is much more appropriate than checkout in this context.
196N/A .sp
196N/A-Example: "I\(aqm using checkout X."
196N/A+Example: "I'm using checkout X."
196N/A .sp
196N/A (Verb) Updating the working directory to a specific changeset. See
196N/A-\%\fBhg help update\fP\:.
196N/A+\fBhg help update\fP.
196N/A .sp
196N/A-Example: "I\(aqm going to check out changeset X."
196N/A+Example: "I'm going to check out changeset X."
196N/A .TP
196N/A .B Child changeset
196N/A .
196N/A-See \(aqChangeset, child\(aq.
196N/A+See 'Changeset, child'.
196N/A .TP
196N/A .B Close changeset
196N/A .
196N/A-See \(aqChangeset, close\(aq.
196N/A+See 'Changeset, close'.
196N/A .TP
196N/A .B Closed branch
196N/A .
196N/A-See \(aqBranch, closed\(aq.
196N/A+See 'Branch, closed'.
196N/A .TP
196N/A .B Clone
196N/A .
196N/A@@ -4658,13 +4632,13 @@
196N/A .sp
196N/A Example: "Is your clone up to date?".
196N/A .sp
196N/A-(Verb) The process of creating a clone, using \%\fBhg clone\fP\:.
196N/A+(Verb) The process of creating a clone, using \fBhg clone\fP.
196N/A .sp
196N/A-Example: "I\(aqm going to clone the repository".
196N/A+Example: "I'm going to clone the repository".
196N/A .TP
196N/A .B Closed branch head
196N/A .
196N/A-See \(aqHead, closed branch\(aq.
196N/A+See 'Head, closed branch'.
196N/A .TP
196N/A .B Commit
196N/A .
196N/A@@ -4689,13 +4663,13 @@
196N/A system (DVCS) can be described as a directed acyclic graph (DAG),
196N/A consisting of nodes and edges, where nodes correspond to
196N/A changesets and edges imply a parent \-> child relation. This graph
196N/A-can be visualized by graphical tools such as \%\fBhg glog\fP\:
196N/A+can be visualized by graphical tools such as \fBhg glog\fP
196N/A (graphlog). In Mercurial, the DAG is limited by the requirement
196N/A for children to have at most two parents.
196N/A .TP
196N/A .B Default branch
196N/A .
196N/A-See \(aqBranch, default\(aq.
196N/A+See 'Branch, default'.
196N/A .TP
196N/A .B Descendant
196N/A .
196N/A@@ -4703,7 +4677,7 @@
196N/A from a given changeset. More precisely, the descendants of a
196N/A changeset can be defined by two properties: the child of a
196N/A changeset is a descendant, and the child of a descendant is a
196N/A-descendant. See also: \(aqAncestor\(aq.
196N/A+descendant. See also: 'Ancestor'.
196N/A .TP
196N/A .B Diff
196N/A .
196N/A@@ -4728,19 +4702,19 @@
196N/A Mercurial, that will be recorded in the next commit. The working
196N/A directory initially corresponds to the snapshot at an existing
196N/A changeset, known as the parent of the working directory. See
196N/A-\(aqParent, working directory\(aq. The state may be modified by changes
196N/A+\'Parent, working directory'. The state may be modified by changes
196N/A to the files introduced manually or by a merge. The repository
196N/A metadata exists in the .hg directory inside the working directory.
196N/A .TP
196N/A .B Graph
196N/A .
196N/A-See DAG and \%\fBhg help graphlog\fP\:.
196N/A+See DAG and \fBhg help graphlog\fP.
196N/A .TP
196N/A .B Head
196N/A .
196N/A-The term \(aqhead\(aq may be used to refer to both a branch head or a
196N/A-repository head, depending on the context. See \(aqHead, branch\(aq and
196N/A-\(aqHead, repository\(aq for specific definitions.
196N/A+The term 'head' may be used to refer to both a branch head or a
196N/A+repository head, depending on the context. See 'Head, branch' and
196N/A+\'Head, repository' for specific definitions.
196N/A .sp
196N/A Heads are where development generally takes place and are the
196N/A usual targets for update and merge operations.
196N/A@@ -4752,9 +4726,9 @@
196N/A .B Head, closed branch
196N/A .
196N/A A changeset that marks a head as no longer interesting. The closed
196N/A-head is no longer listed by \%\fBhg heads\fP\:. A branch is considered
196N/A+head is no longer listed by \fBhg heads\fP. A branch is considered
196N/A closed when all its heads are closed and consequently is not
196N/A-listed by \%\fBhg branches\fP\:.
196N/A+listed by \fBhg branches\fP.
196N/A .TP
196N/A .B Head, repository
196N/A .
196N/A@@ -4780,11 +4754,11 @@
196N/A .TP
196N/A .B Immutable history
196N/A .
196N/A-See \(aqHistory, immutable\(aq.
196N/A+See 'History, immutable'.
196N/A .TP
196N/A .B Merge changeset
196N/A .
196N/A-See \(aqChangeset, merge\(aq.
196N/A+See 'Changeset, merge'.
196N/A .TP
196N/A .B Manifest
196N/A .
196N/A@@ -4801,7 +4775,7 @@
196N/A .TP
196N/A .B Named branch
196N/A .
196N/A-See \(aqBranch, named\(aq.
196N/A+See 'Branch, named'.
196N/A .TP
196N/A .B Null changeset
196N/A .
196N/A@@ -4808,30 +4782,30 @@
196N/A The empty changeset. It is the parent state of newly\-initialized
196N/A repositories and repositories with no checked out revision. It is
196N/A thus the parent of root changesets and the effective ancestor when
196N/A-merging unrelated changesets. Can be specified by the alias \(aqnull\(aq
196N/A-or by the changeset ID \(aq000000000000\(aq.
196N/A+merging unrelated changesets. Can be specified by the alias 'null'
196N/A+or by the changeset ID '000000000000'.
196N/A .TP
196N/A .B Parent
196N/A .
196N/A-See \(aqChangeset, parent\(aq.
196N/A+See 'Changeset, parent'.
196N/A .TP
196N/A .B Parent changeset
196N/A .
196N/A-See \(aqChangeset, parent\(aq.
196N/A+See 'Changeset, parent'.
196N/A .TP
196N/A .B Parent, working directory
196N/A .
196N/A The working directory parent reflects a virtual revision which is
196N/A the child of the changeset (or two changesets with an uncommitted
196N/A-merge) shown by \%\fBhg parents\fP\:. This is changed with
196N/A-\%\fBhg update\fP\:. Other commands to see the working directory parent
196N/A-are \%\fBhg summary\fP\: and \%\fBhg id\fP\:. Can be specified by the alias ".".
196N/A+merge) shown by \fBhg parents\fP. This is changed with
196N/A+\fBhg update\fP. Other commands to see the working directory parent
196N/A+are \fBhg summary\fP and \fBhg id\fP. Can be specified by the alias ".".
196N/A .TP
196N/A .B Patch
196N/A .
196N/A (Noun) The product of a diff operation.
196N/A .sp
196N/A-Example: "I\(aqve sent you my patch."
196N/A+Example: "I've sent you my patch."
196N/A .sp
196N/A (Verb) The process of using a patch file to transform one
196N/A changeset into another.
196N/A@@ -4844,7 +4818,7 @@
196N/A not in the local repository are brought into the local
196N/A repository. Note that this operation without special arguments
196N/A only updates the repository, it does not update the files in the
196N/A-working directory. See \%\fBhg help pull\fP\:.
196N/A+working directory. See \fBhg help pull\fP.
196N/A .TP
196N/A .B Push
196N/A .
196N/A@@ -4852,7 +4826,7 @@
196N/A not in a remote repository are sent to the remote repository. Note
196N/A that this operation only adds changesets which have been committed
196N/A locally to the remote repository. Uncommitted changes are not
196N/A-sent. See \%\fBhg help push\fP\:.
196N/A+sent. See \fBhg help push\fP.
196N/A .TP
196N/A .B Repository
196N/A .
196N/A@@ -4865,13 +4839,13 @@
196N/A .TP
196N/A .B Repository head
196N/A .
196N/A-See \(aqHead, repository\(aq.
196N/A+See 'Head, repository'.
196N/A .TP
196N/A .B Revision
196N/A .
196N/A A state of the repository at some point in time. Earlier revisions
196N/A-can be updated to by using \%\fBhg update\fP\:. See also \(aqRevision
196N/A-number\(aq; See also \(aqChangeset\(aq.
196N/A+can be updated to by using \fBhg update\fP. See also 'Revision
196N/A+number'; See also 'Changeset'.
196N/A .TP
196N/A .B Revision number
196N/A .
196N/A@@ -4880,7 +4854,7 @@
196N/A to a repository, starting with revision number 0. Note that the
196N/A revision number may be different in each clone of a repository. To
196N/A identify changesets uniquely between different clones, see
196N/A-\(aqChangeset id\(aq.
196N/A+\'Changeset id'.
196N/A .TP
196N/A .B Revlog
196N/A .
196N/A@@ -4891,7 +4865,7 @@
196N/A .TP
196N/A .B Rewriting history
196N/A .
196N/A-See \(aqHistory, rewriting\(aq.
196N/A+See 'History, rewriting'.
196N/A .TP
196N/A .B Root
196N/A .
196N/A@@ -4907,7 +4881,7 @@
196N/A .
196N/A The head of a given branch with the highest revision number. When
196N/A a branch name is used as a revision identifier, it refers to the
196N/A-branch tip. See also \(aqBranch, head\(aq. Note that because revision
196N/A+branch tip. See also 'Branch, head'. Note that because revision
196N/A numbers may be different in different repository clones, the
196N/A branch tip may be different in different cloned repositories.
196N/A .TP
196N/A@@ -4915,21 +4889,21 @@
196N/A .
196N/A (Noun) Another synonym of changeset.
196N/A .sp
196N/A-Example: "I\(aqve pushed an update".
196N/A+Example: "I've pushed an update".
196N/A .sp
196N/A (Verb) This term is usually used to describe updating the state of
196N/A the working directory to that of a specific changeset. See
196N/A-\%\fBhg help update\fP\:.
196N/A+\fBhg help update\fP.
196N/A .sp
196N/A Example: "You should update".
196N/A .TP
196N/A .B Working directory
196N/A .
196N/A-See \(aqDirectory, working\(aq.
196N/A+See 'Directory, working'.
196N/A .TP
196N/A .B Working directory parent
196N/A .
196N/A-See \(aqParent, working directory\(aq.
196N/A+See 'Parent, working directory'.
196N/A .UNINDENT
196N/A .SH EXTENSIONS
196N/A .sp
196N/A@@ -5011,7 +4985,7 @@
196N/A .SS Example Configuration
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hooks]
196N/A
196N/A # Use this if you want to check access restrictions at commit time
196N/A@@ -5087,7 +5061,7 @@
196N/A src/main/resources/** = *
196N/A
196N/A \&.hgtags = release_engineer
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS bugzilla
196N/A .sp
196N/A@@ -5102,8 +5076,8 @@
196N/A .sp
196N/A The hook relies on a Bugzilla script to send bug change notification
196N/A emails. That script changes between Bugzilla versions; the
196N/A-\(aqprocessmail\(aq script used prior to 2.18 is replaced in 2.18 and
196N/A-subsequent versions by \(aqconfig/sendbugmail.pl\(aq. Note that these will
196N/A+\'processmail' script used prior to 2.18 is replaced in 2.18 and
196N/A+subsequent versions by 'config/sendbugmail.pl'. Note that these will
196N/A be run by Mercurial as the user pushing the change; you will need to
196N/A ensure the Bugzilla install file permissions are set appropriately.
196N/A .sp
196N/A@@ -5117,11 +5091,11 @@
196N/A .TP
196N/A .B db
196N/A .
196N/A-Name of the Bugzilla database in MySQL. Default \(aqbugs\(aq.
196N/A+Name of the Bugzilla database in MySQL. Default 'bugs'.
196N/A .TP
196N/A .B user
196N/A .
196N/A-Username to use to access MySQL server. Default \(aqbugs\(aq.
196N/A+Username to use to access MySQL server. Default 'bugs'.
196N/A .TP
196N/A .B password
196N/A .
196N/A@@ -5133,8 +5107,8 @@
196N/A .TP
196N/A .B version
196N/A .
196N/A-Bugzilla version. Specify \(aq3.0\(aq for Bugzilla versions 3.0 and later,
196N/A-\(aq2.18\(aq for Bugzilla versions from 2.18 and \(aq2.16\(aq for versions prior
196N/A+Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,
196N/A+\'2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior
196N/A to 2.18.
196N/A .TP
196N/A .B bzuser
196N/A@@ -5145,13 +5119,13 @@
196N/A .B bzdir
196N/A .
196N/A Bugzilla install directory. Used by default notify. Default
196N/A-\(aq/var/www/html/bugzilla\(aq.
196N/A+\'/var/www/html/bugzilla'.
196N/A .TP
196N/A .B notify
196N/A .
196N/A The command to run to get Bugzilla to send bug change notification
196N/A-emails. Substitutes from a map with 3 keys, \(aqbzdir\(aq, \(aqid\(aq (bug id)
196N/A-and \(aquser\(aq (committer bugzilla email). Default depends on version;
196N/A+emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)
196N/A+and 'user' (committer bugzilla email). Default depends on version;
196N/A from 2.18 it is "cd %(bzdir)s && perl \-T contrib/sendbugmail.pl
196N/A %(id)s %(user)s".
196N/A .TP
196N/A@@ -5158,9 +5132,9 @@
196N/A .B regexp
196N/A .
196N/A Regular expression to match bug IDs in changeset commit message.
196N/A-Must contain one "()" group. The default expression matches \(aqBug
196N/A-1234\(aq, \(aqBug no. 1234\(aq, \(aqBug number 1234\(aq, \(aqBugs 1234,5678\(aq, \(aqBug
196N/A-1234 and 5678\(aq and variations thereof. Matching is case insensitive.
196N/A+Must contain one "()" group. The default expression matches 'Bug
196N/A+1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug
196N/A+1234 and 5678' and variations thereof. Matching is case insensitive.
196N/A .TP
196N/A .B style
196N/A .
196N/A@@ -5173,18 +5147,18 @@
196N/A extension specifies:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A {bug} The Bugzilla bug ID.
196N/A {root} The full pathname of the Mercurial repository.
196N/A {webroot} Stripped pathname of the Mercurial repository.
196N/A {hgweb} Base URL for browsing Mercurial repositories.
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .INDENT 7.0
196N/A .TP
196N/A-.B Default \(aqchangeset {node|short} in repo {root} refers \(aq
196N/A+.B Default 'changeset {node|short} in repo {root} refers '
196N/A .
196N/A-\(aqto bug {bug}.ndetails:nt{desc|tabindent}\(aq
196N/A+\'to bug {bug}.ndetails:nt{desc|tabindent}'
196N/A .UNINDENT
196N/A .TP
196N/A .B strip
196N/A@@ -5215,7 +5189,7 @@
196N/A Activating the extension:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A bugzilla =
196N/A
196N/A@@ -5222,7 +5196,7 @@
196N/A [hooks]
196N/A # run bugzilla hook on every change pulled or pushed in here
196N/A incoming.bugzilla = python:hgext.bugzilla.hook
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Example configuration:
196N/A@@ -5232,7 +5206,7 @@
196N/A installation in /opt/bugzilla\-3.2.
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [bugzilla]
196N/A host=localhost
196N/A password=XYZZY
196N/A@@ -5249,18 +5223,18 @@
196N/A
196N/A [usermap]
196N/A user@emaildomain.com=user.name@bugzilladomain.com
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Commits add a comment to the Bugzilla bug record of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A Changeset 3b16791d6642 in repository\-name.
196N/A http://dev.domain.com/hg/repository\-name/rev/3b16791d6642
196N/A
196N/A Changeset commit comment. Bug 1234.
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS children
196N/A .sp
196N/A@@ -5269,12 +5243,12 @@
196N/A .SS children
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg children [\-r REV] [FILE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-Print the children of the working directory\(aqs revisions. If a
196N/A+Print the children of the working directory's revisions. If a
196N/A revision is given via \-r/\-\-rev, the children of that revision will
196N/A be printed. If a file argument is given, revision in which the
196N/A file was last changed (after the working directory revision or the
196N/A@@ -5302,9 +5276,9 @@
196N/A .SS churn
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg churn [\-d DATE] [\-r REV] [\-\-aliases FILE] [FILE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This command will display a histogram representing the number
196N/A@@ -5320,19 +5294,19 @@
196N/A Examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A # display count of changed lines for every committer
196N/A-hg churn \-t \(aq{author|email}\(aq
196N/A+hg churn \-t '{author|email}'
196N/A
196N/A # display daily activity graph
196N/A-hg churn \-f \(aq%H\(aq \-s \-c
196N/A+hg churn \-f '%H' \-s \-c
196N/A
196N/A # display activity of developers by month
196N/A-hg churn \-f \(aq%Y\-%m\(aq \-s \-c
196N/A+hg churn \-f '%Y\-%m' \-s \-c
196N/A
196N/A # display count of lines changed in every year
196N/A-hg churn \-f \(aq%Y\(aq \-s
196N/A-.ft P
196N/A+hg churn \-f '%Y' \-s
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A It is possible to map alternate email addresses to a main address
196N/A@@ -5339,9 +5313,9 @@
196N/A by providing a file using the following format:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A <alias email> = <actual email>
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Such a file may be specified with the \-\-aliases option, otherwise
196N/A@@ -5407,7 +5381,7 @@
196N/A Default effects may be overridden from your configuration file:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [color]
196N/A status.modified = blue bold underline red_background
196N/A status.added = green bold
196N/A@@ -5416,7 +5390,7 @@
196N/A status.unknown = magenta bold underline
196N/A status.ignored = black bold
196N/A
196N/A-# \(aqnone\(aq turns off all effects
196N/A+# 'none' turns off all effects
196N/A status.clean = none
196N/A status.copied = none
196N/A
196N/A@@ -5443,7 +5417,7 @@
196N/A branches.closed = black bold
196N/A branches.current = green
196N/A branches.inactive = none
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The color extension will try to detect whether to use ANSI codes or
196N/A@@ -5450,13 +5424,13 @@
196N/A Win32 console APIs, unless it is made explicit:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [color]
196N/A mode = ansi
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-Any value other than \(aqansi\(aq, \(aqwin32\(aq, or \(aqauto\(aq will disable color.
196N/A+Any value other than 'ansi', 'win32', or 'auto' will disable color.
196N/A .SS convert
196N/A .sp
196N/A import revisions from foreign VCS repositories into Mercurial
196N/A@@ -5464,9 +5438,9 @@
196N/A .SS convert
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg convert [OPTION]... SOURCE [DEST [REVMAP]]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Accepted source formats [identifiers]:
196N/A@@ -5516,7 +5490,7 @@
196N/A .sp
196N/A If no destination directory name is specified, it defaults to the
196N/A basename of the source with \fB\-hg\fP appended. If the destination
196N/A-repository doesn\(aqt exist, it will be created.
196N/A+repository doesn't exist, it will be created.
196N/A .sp
196N/A By default, all sources except Mercurial will use \-\-branchsort.
196N/A Mercurial uses \-\-sourcesort to preserve original revision numbers
196N/A@@ -5542,19 +5516,19 @@
196N/A supported by Mercurial sources.
196N/A .UNINDENT
196N/A .sp
196N/A-If \fBREVMAP\fP isn\(aqt given, it will be put in a default location
196N/A+If \fBREVMAP\fP isn't given, it will be put in a default location
196N/A (\fB<dest>/.hg/shamap\fP by default). The \fBREVMAP\fP is a simple
196N/A text file that maps each source commit ID to the destination ID
196N/A for that revision, like so:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A <source ID> <destination ID>
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-If the file doesn\(aqt exist, it\(aqs automatically created. It\(aqs
196N/A-updated on each commit copied, so \%\fBhg convert\fP\: can be interrupted
196N/A+If the file doesn't exist, it's automatically created. It's
196N/A+updated on each commit copied, so \fBhg convert\fP can be interrupted
196N/A and can be run repeatedly to copy new commits.
196N/A .sp
196N/A The authormap is a simple text file that maps each source commit
196N/A@@ -5563,9 +5537,9 @@
196N/A author mapping and the line format is:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A source author = destination author
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Empty lines and lines starting with a \fB#\fP are ignored.
196N/A@@ -5575,13 +5549,13 @@
196N/A directives:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A include path/to/file\-or\-dir
196N/A
196N/A exclude path/to/file\-or\-dir
196N/A
196N/A rename path/to/source path/to/destination
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Comment lines start with \fB#\fP. A specified path matches if it
196N/A@@ -5605,9 +5579,9 @@
196N/A comma\-separated values:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A key parent1, parent2
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The key is the revision ID in the source
196N/A@@ -5627,9 +5601,9 @@
196N/A lines of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A original_branch_name new_branch_name
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A where "original_branch_name" is the name of the branch in the
196N/A@@ -5876,9 +5850,9 @@
196N/A Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
196N/A checked out and stored in the repository in that format and files
196N/A declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
196N/A-\fBnative\fP is an alias for checking out in the platform\(aqs default line
196N/A+\fBnative\fP is an alias for checking out in the platform's default line
196N/A ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on
196N/A-Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs
196N/A+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
196N/A default behaviour; it is only needed if you need to override a later,
196N/A more general pattern.
196N/A .sp
196N/A@@ -5895,7 +5869,7 @@
196N/A Example versioned \fB.hgeol\fP file:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [patterns]
196N/A **.py = native
196N/A **.vcproj = CRLF
196N/A@@ -5905,7 +5879,7 @@
196N/A
196N/A [repository]
196N/A native = LF
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP Note
196N/A .
196N/A@@ -5921,7 +5895,7 @@
196N/A .
196N/A \fBeol.native\fP (default \fBos.linesep\fP) can be set to \fBLF\fP or
196N/A \fBCRLF\fP to override the default interpretation of \fBnative\fP for
196N/A-checkout. This can be used with \%\fBhg archive\fP\: on Unix, say, to
196N/A+checkout. This can be used with \fBhg archive\fP on Unix, say, to
196N/A generate an archive where files have line endings for Windows.
196N/A .IP \(bu 2
196N/A .
196N/A@@ -5944,7 +5918,7 @@
196N/A Remember to enable the eol extension in the repository where you
196N/A install the hook.
196N/A .sp
196N/A-See \%\fBhg help patterns\fP\: for more information about the glob patterns
196N/A+See \fBhg help patterns\fP for more information about the glob patterns
196N/A used.
196N/A .SS extdiff
196N/A .sp
196N/A@@ -5957,12 +5931,12 @@
196N/A files to compare.
196N/A .sp
196N/A The extdiff extension also allows to configure new diff commands, so
196N/A-you do not need to type \%\fBhg extdiff \-p kdiff3\fP\: always.
196N/A+you do not need to type \fBhg extdiff \-p kdiff3\fP always.
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extdiff]
196N/A-# add new command that runs GNU diff(1) in \(aqcontext diff\(aq mode
196N/A+# add new command that runs GNU diff(1) in 'context diff' mode
196N/A cdiff = gdiff \-Nprc5
196N/A ## or the old way:
196N/A #cmd.cdiff = gdiff
196N/A@@ -5978,19 +5952,19 @@
196N/A # (see http://www.vim.org/scripts/script.php?script_id=102) Non
196N/A # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
196N/A # your .vimrc
196N/A-vimdiff = gvim \-f \(aq+next\(aq \(aq+execute "DirDiff" argv(0) argv(1)\(aq
196N/A-.ft P
196N/A+vimdiff = gvim \-f '+next' '+execute "DirDiff" argv(0) argv(1)'
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Tool arguments can include variables that are expanded at runtime:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $parent1, $plabel1 \- filename, descriptive label of first parent
196N/A $child, $clabel \- filename, descriptive label of child revision
196N/A $parent2, $plabel2 \- filename, descriptive label of second parent
196N/A $parent is an alias for $parent1.
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The extdiff extension will look in your [diff\-tools] and [merge\-tools]
196N/A@@ -5997,17 +5971,17 @@
196N/A sections for diff tool arguments, when none are specified in [extdiff].
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extdiff]
196N/A kdiff3 =
196N/A
196N/A [diff\-tools]
196N/A-kdiff3.diffargs=\-\-L1 \(aq$plabel1\(aq \-\-L2 \(aq$clabel\(aq $parent $child
196N/A-.ft P
196N/A+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can use \-I/\-X and list of file or directory names like normal
196N/A-\%\fBhg diff\fP\: command. The extdiff extension makes snapshots of only
196N/A+\fBhg diff\fP command. The extdiff extension makes snapshots of only
196N/A needed files, so running the external diff program will actually be
196N/A pretty fast (at least faster than having to compare the entire tree).
196N/A .SS Commands
196N/A@@ -6014,9 +5988,9 @@
196N/A .SS extdiff
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg extdiff [OPT]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show differences between revisions for the specified files, using
196N/A@@ -6068,9 +6042,9 @@
196N/A .SS fetch
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg fetch [SOURCE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This finds all changes from the repository at the specified path
196N/A@@ -6086,7 +6060,7 @@
196N/A parent, with local changes as the second. To switch the merge
196N/A order, use \-\-switch\-parent.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Returns 0 on success.
196N/A .sp
196N/A@@ -6144,9 +6118,9 @@
196N/A .SS sigcheck
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg sigcheck REVISION
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A verify all the signatures there may be for a particular revision
196N/A@@ -6153,15 +6127,15 @@
196N/A .SS sign
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg sign [OPTION]... [REVISION]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If no revision is given, the parent of the working directory is used,
196N/A or tip if no revision is checked out.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -6197,9 +6171,9 @@
196N/A .SS sigs
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg sigs
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A list signed changesets
196N/A@@ -6214,9 +6188,9 @@
196N/A .SS glog
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg glog [OPTION]... [FILE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Print a revision history alongside a revision graph drawn with
196N/A@@ -6256,7 +6230,7 @@
196N/A configure it, set the following options in your hgrc:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [cia]
196N/A # your registered CIA user name
196N/A user = foo
196N/A@@ -6286,7 +6260,7 @@
196N/A [web]
196N/A # If you want hyperlinks (optional)
196N/A baseurl = http://server/path/to/repo
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS hgk
196N/A .sp
196N/A@@ -6302,15 +6276,15 @@
196N/A the contrib directory, and the extension is shipped in the hgext
196N/A repository, and needs to be enabled.
196N/A .sp
196N/A-The \%\fBhg view\fP\: command will launch the hgk Tcl script. For this command
196N/A+The \fBhg view\fP command will launch the hgk Tcl script. For this command
196N/A to work, hgk must be in your search path. Alternately, you can specify
196N/A the path to hgk in your configuration file:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hgk]
196N/A path=/location/of/hgk
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A hgk can make use of the extdiff extension to visualize revisions.
196N/A@@ -6317,10 +6291,10 @@
196N/A Assuming you had already configured extdiff vdiff command, just add:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hgk]
196N/A vdiff=vdiff
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Revisions context menu will now display additional entries to fire
196N/A@@ -6329,9 +6303,9 @@
196N/A .SS view
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg view [\-l LIMIT] [REVRANGE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A start interactive history viewer
196N/A@@ -6348,28 +6322,28 @@
196N/A syntax highlighting for hgweb (requires Pygments)
196N/A .sp
196N/A It depends on the Pygments syntax highlighting library:
196N/A-\%http://pygments.org/\:
196N/A+http://pygments.org/
196N/A .sp
196N/A There is a single configuration option:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [web]
196N/A pygments_style = <style>
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-The default is \(aqcolorful\(aq.
196N/A+The default is 'colorful'.
196N/A .SS inotify
196N/A .sp
196N/A-accelerate status report using Linux\(aqs inotify service
196N/A+accelerate status report using Linux's inotify service
196N/A .SS Commands
196N/A .SS inserve
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg inserve [OPTION]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A start an inotify server for this repository
196N/A@@ -6405,12 +6379,12 @@
196N/A in your hgrc:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [interhg]
196N/A issues = s!issue(\ed+)!<a href="http://bts/issue\e1">issue\e1</a>!
196N/A bugzilla = s!((?:bug|b=|(?=#?\ed{4,}))(?:\es*#?)(\ed+))!<a..=\e2">\e1</a>!i
196N/A boldify = s!(^|\es)#(\ed+)\eb! <b>#\e2</b>!
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS keyword
196N/A .sp
196N/A@@ -6432,7 +6406,7 @@
196N/A Example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [keyword]
196N/A # expand keywords in every python file except those matching "x*"
196N/A **.py =
196N/A@@ -6441,7 +6415,7 @@
196N/A [keywordset]
196N/A # prefer svn\- over cvs\-like default keywordmaps
196N/A svn = True
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP Note
196N/A .
196N/A@@ -6450,39 +6424,39 @@
99N/A .RE
196N/A .sp
196N/A For [keywordmaps] template mapping and expansion demonstration and
196N/A-control run \%\fBhg kwdemo\fP\:. See \%\fBhg help templates\fP\: for a list of
196N/A+control run \fBhg kwdemo\fP. See \fBhg help templates\fP for a list of
196N/A available templates and filters.
196N/A .sp
196N/A Three additional date template filters are provided:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A utcdate "2006/09/18 15:13:13"
196N/A svnutcdate "2006\-09\-18 15:13:13Z"
196N/A svnisodate "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-The default template mappings (view with \%\fBhg kwdemo \-d\fP\:) can be
196N/A+The default template mappings (view with \fBhg kwdemo \-d\fP) can be
196N/A replaced with customized keywords and templates. Again, run
196N/A-\%\fBhg kwdemo\fP\: to control the results of your configuration changes.
196N/A+\fBhg kwdemo\fP to control the results of your configuration changes.
196N/A .sp
196N/A-Before changing/disabling active keywords, you must run \%\fBhg kwshrink\fP\:
196N/A+Before changing/disabling active keywords, you must run \fBhg kwshrink\fP
196N/A to avoid storing expanded keywords in the change history.
196N/A .sp
196N/A To force expansion after enabling it, or a configuration change, run
196N/A-\%\fBhg kwexpand\fP\:.
196N/A+\fBhg kwexpand\fP.
196N/A .sp
196N/A Expansions spanning more than one line and incremental expansions,
196N/A-like CVS\(aq $Log$, are not supported. A keyword template map "Log =
196N/A+like CVS' $Log$, are not supported. A keyword template map "Log =
196N/A {desc}" expands to the first line of the changeset description.
196N/A .SS Commands
196N/A .SS kwdemo
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Show current, custom, or default keyword template maps and their
196N/A@@ -6493,7 +6467,7 @@
196N/A .sp
196N/A Use \-d/\-\-default to disable current configuration.
196N/A .sp
196N/A-See \%\fBhg help templates\fP\: for information on templates and filters.
196N/A+See \fBhg help templates\fP for information on templates and filters.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -6509,9 +6483,9 @@
196N/A .SS kwexpand
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg kwexpand [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Run after (re)enabling keyword expansion.
196N/A@@ -6532,9 +6506,9 @@
196N/A .SS kwfiles
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg kwfiles [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A List which files in the working directory are matched by the
196N/A@@ -6544,7 +6518,7 @@
196N/A execution by including only files that are actual candidates for
196N/A expansion.
196N/A .sp
196N/A-See \%\fBhg help keyword\fP\: on how to construct patterns both for
196N/A+See \fBhg help keyword\fP on how to construct patterns both for
196N/A inclusion and exclusion of files.
196N/A .sp
196N/A With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
196N/A@@ -6551,12 +6525,12 @@
196N/A of files are:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A K = keyword expansion candidate
196N/A k = keyword expansion candidate (not tracked)
196N/A I = ignored
196N/A i = ignored (not tracked)
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Options:
196N/A@@ -6585,9 +6559,9 @@
196N/A .SS kwshrink
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg kwshrink [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Must be run before changing/disabling active keywords.
196N/A@@ -6616,10 +6590,10 @@
196N/A Known patches are represented as patch files in the .hg/patches
196N/A directory. Applied patches are both patch files and changesets.
196N/A .sp
196N/A-Common tasks (use \%\fBhg help command\fP\: for more details):
196N/A+Common tasks (use \fBhg help command\fP for more details):
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A create new patch qnew
196N/A import existing patch qimport
196N/A
196N/A@@ -6629,7 +6603,7 @@
196N/A add known patch to applied stack qpush
196N/A remove patch from applied stack qpop
196N/A refresh contents of top applied patch qrefresh
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A By default, mq will automatically use git patches when required to
196N/A@@ -6637,26 +6611,26 @@
196N/A files creations or deletions. This behaviour can be configured with:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [mq]
196N/A git = auto/keep/yes/no
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-If set to \(aqkeep\(aq, mq will obey the [diff] section configuration while
196N/A-preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or
196N/A-\(aqno\(aq, mq will override the [diff] section and always generate git or
196N/A+If set to 'keep', mq will obey the [diff] section configuration while
196N/A+preserving existing git patches upon qrefresh. If set to 'yes' or
196N/A+\'no', mq will override the [diff] section and always generate git or
196N/A regular patches, possibly losing data in the second case.
196N/A .sp
196N/A You will by default be managing a patch queue named "patches". You can
196N/A-create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
196N/A+create other, independent patch queues with the \fBhg qqueue\fP command.
196N/A .SS Commands
196N/A .SS qapplied
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qapplied [\-1] [\-s] [PATCH]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -6675,9 +6649,9 @@
196N/A .SS qclone
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qclone [OPTION]... SOURCE [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If source is local, destination will have no patches applied. If
196N/A@@ -6690,7 +6664,7 @@
196N/A default. Use \-p <url> to change.
196N/A .sp
196N/A The patch directory must be a nested Mercurial repository, as
196N/A-would be created by \%\fBhg init \-\-mq\fP\:.
196N/A+would be created by \fBhg init \-\-mq\fP.
196N/A .sp
196N/A Return 0 on success.
196N/A .sp
196N/A@@ -6728,12 +6702,12 @@
196N/A .SS qcommit
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qcommit [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-This command is deprecated; use \%\fBhg commit \-\-mq\fP\: instead.
196N/A+This command is deprecated; use \fBhg commit \-\-mq\fP instead.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -6775,9 +6749,9 @@
196N/A .SS qdelete
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qdelete [\-k] [PATCH]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The patches must not be applied, and at least one patch is required. With
196N/A@@ -6784,7 +6758,7 @@
196N/A \-k/\-\-keep, the patch files are preserved in the patch directory.
196N/A .sp
196N/A To stop managing a patch and move it into permanent history,
196N/A-use the \%\fBhg qfinish\fP\: command.
196N/A+use the \fBhg qfinish\fP command.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -6802,9 +6776,9 @@
196N/A .SS qdiff
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qdiff [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Shows a diff which includes the current patch as well as any
196N/A@@ -6812,8 +6786,8 @@
196N/A last refresh (thus showing what the current patch would become
196N/A after a qrefresh).
196N/A .sp
196N/A-Use \%\fBhg diff\fP\: if you only want to see the changes made since the
196N/A-last qrefresh, or \%\fBhg export qtip\fP\: if you want to see changes
196N/A+Use \fBhg diff\fP if you only want to see the changes made since the
196N/A+last qrefresh, or \fBhg export qtip\fP if you want to see changes
196N/A made by the current patch without including changes made since the
196N/A qrefresh.
196N/A .sp
196N/A@@ -6873,9 +6847,9 @@
196N/A .SS qfinish
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qfinish [\-a] [REV]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Finishes the specified revisions (corresponding to applied
196N/A@@ -6903,9 +6877,9 @@
196N/A .SS qfold
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qfold [\-e] [\-k] [\-m TEXT] [\-l FILE] PATCH...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Patches must not yet be applied. Each patch will be successively
196N/A@@ -6942,9 +6916,9 @@
196N/A .SS qgoto
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qgoto [OPTION]... PATCH
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -6959,15 +6933,15 @@
196N/A .SS qguard
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Guards control whether a patch can be pushed. A patch with no
196N/A guards is always pushed. A patch with a positive guard ("+foo") is
196N/A-pushed only if the \%\fBhg qselect\fP\: command has activated it. A patch with
196N/A-a negative guard ("\-foo") is never pushed if the \%\fBhg qselect\fP\: command
196N/A+pushed only if the \fBhg qselect\fP command has activated it. A patch with
196N/A+a negative guard ("\-foo") is never pushed if the \fBhg qselect\fP command
196N/A has activated it.
196N/A .sp
196N/A With no arguments, print the currently active guards.
196N/A@@ -6974,15 +6948,15 @@
196N/A With arguments, set guards for the named patch.
196N/A .IP Note
196N/A .
196N/A-Specifying negative guards now requires \(aq\-\-\(aq.
196N/A+Specifying negative guards now requires '\-\-'.
99N/A .RE
196N/A .sp
196N/A To set guards on another patch:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qguard other.patch \-\- +2.6.17 \-stable
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7001,9 +6975,9 @@
196N/A .SS qheader
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qheader [PATCH]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7010,9 +6984,9 @@
196N/A .SS qimport
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... FILE...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The patch is inserted into the series after the last applied
196N/A@@ -7042,9 +7016,9 @@
196N/A To import an existing patch while renaming it:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qimport \-e existing\-patch \-n new\-name
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 if import succeeded.
196N/A@@ -7079,9 +7053,9 @@
196N/A .SS qinit
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qinit [\-c]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The queue repository is unversioned by default. If
196N/A@@ -7090,8 +7064,8 @@
196N/A an unversioned patch repository into a versioned one). You can use
196N/A qcommit to commit changes to this queue repository.
196N/A .sp
196N/A-This command is deprecated. Without \-c, it\(aqs implied by other relevant
196N/A-commands. With \-c, use \%\fBhg init \-\-mq\fP\: instead.
196N/A+This command is deprecated. Without \-c, it's implied by other relevant
196N/A+commands. With \-c, use \fBhg init \-\-mq\fP instead.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -7103,9 +7077,9 @@
196N/A .SS qnew
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qnew [\-e] [\-m TEXT] [\-l FILE] PATCH [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A qnew creates a new patch on top of the currently\-applied patch (if
196N/A@@ -7121,7 +7095,7 @@
196N/A .sp
196N/A \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
196N/A well as the commit message. If none is specified, the header is
196N/A-empty and the commit message is \(aq[mq]: PATCH\(aq.
196N/A+empty and the commit message is '[mq]: PATCH'.
196N/A .sp
196N/A Use the \-g/\-\-git option to keep the patch in the git extended diff
196N/A format. Read the diffs help topic for more information on why this
196N/A@@ -7180,9 +7154,9 @@
196N/A .SS qnext
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qnext [\-s]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7197,9 +7171,9 @@
196N/A .SS qpop
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qpop [\-a] [\-f] [PATCH | INDEX]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A By default, pops off the top of the patch stack. If given a patch
196N/A@@ -7226,9 +7200,9 @@
196N/A .SS qprev
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qprev [\-s]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7243,9 +7217,9 @@
196N/A .SS qpush
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A When \-f/\-\-force is applied, all local changes in patched files
196N/A@@ -7287,9 +7261,9 @@
196N/A .SS qqueue
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qqueue [OPTION] [QUEUE]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Supports switching between different patch queues, as well as creating
196N/A@@ -7335,9 +7309,9 @@
196N/A .SS qrefresh
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qrefresh [\-I] [\-X] [\-e] [\-m TEXT] [\-l FILE] [\-s] [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If any file patterns are provided, the refreshed patch will
196N/A@@ -7408,9 +7382,9 @@
196N/A .SS qrename
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qrename PATCH1 [PATCH2]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A With one argument, renames the current patch to PATCH1.
196N/A@@ -7426,12 +7400,12 @@
196N/A .SS qrestore
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qrestore [\-d] [\-u] REV
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-This command is deprecated, use \%\fBhg rebase\fP\: instead.
196N/A+This command is deprecated, use \fBhg rebase\fP instead.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -7447,12 +7421,12 @@
196N/A .SS qsave
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-This command is deprecated, use \%\fBhg rebase\fP\: instead.
196N/A+This command is deprecated, use \fBhg rebase\fP instead.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -7484,12 +7458,12 @@
196N/A .SS qselect
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qselect [OPTION]... [GUARD]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-Use the \%\fBhg qguard\fP\: command to set or print guards on patch, then use
196N/A+Use the \fBhg qguard\fP command to set or print guards on patch, then use
196N/A qselect to tell mq which guards to use. A patch will be pushed if
196N/A it has no guards or any positive guards match the currently
196N/A selected guard, but will not be pushed if any negative guards
196N/A@@ -7496,11 +7470,11 @@
196N/A match the current guard. For example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A qguard foo.patch \-\- \-stable (negative guard)
196N/A qguard bar.patch +stable (positive guard)
196N/A qselect stable
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This activates the "stable" guard. mq will skip foo.patch (because
196N/A@@ -7547,9 +7521,9 @@
196N/A .SS qseries
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qseries [\-ms]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7568,9 +7542,9 @@
196N/A .SS qtop
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qtop [\-s]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7585,9 +7559,9 @@
196N/A .SS qunapplied
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg qunapplied [\-1] [\-s] [PATCH]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Returns 0 on success.
196N/A@@ -7606,9 +7580,9 @@
196N/A .SS strip
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg strip [\-k] [\-f] [\-n] REV...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The strip command removes the specified changesets and all their
196N/A@@ -7621,8 +7595,8 @@
196N/A completes.
196N/A .sp
196N/A Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
196N/A-bundle (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:). They can
196N/A-be restored by running \%\fBhg unbundle .hg/strip\-backup/BUNDLE\fP\:,
196N/A+bundle (see \fBhg help bundle\fP and \fBhg help unbundle\fP). They can
196N/A+be restored by running \fBhg unbundle .hg/strip\-backup/BUNDLE\fP,
196N/A where BUNDLE is the bundle file created by the strip. Note that
196N/A the local revision numbers will in general be different after the
196N/A restore.
196N/A@@ -7666,7 +7640,7 @@
196N/A this:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A notify =
196N/A
196N/A@@ -7678,21 +7652,21 @@
196N/A
196N/A [notify]
196N/A # config items go here
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Required configuration items:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A config = /path/to/file # file containing subscriptions
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Optional configuration items:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A test = True # print messages to stdout for testing
196N/A strip = 3 # number of slashes to strip for url paths
196N/A domain = example.com # domain to use if committer missing domain
196N/A@@ -7710,7 +7684,7 @@
196N/A from = user@host.com # email address to send as if none given
196N/A [web]
196N/A baseurl = http://hgserver/... # root of hg web site for browsing commits
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The notify config file has same format as a regular hgrc file. It has
196N/A@@ -7718,7 +7692,7 @@
196N/A handier for you.
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [usersubs]
196N/A # key is subscriber email, value is ","\-separated list of glob patterns
196N/A user@host = pattern
196N/A@@ -7726,7 +7700,7 @@
196N/A [reposubs]
196N/A # key is glob pattern, value is ","\-separated list of subscriber emails
196N/A pattern = user@host
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Glob patterns are matched against path to repository root.
196N/A@@ -7740,10 +7714,10 @@
196N/A To set the pager that should be used, set the application variable:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [pager]
196N/A pager = less \-FRSX
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If no pager is set, the pager extensions uses the environment variable
196N/A@@ -7753,10 +7727,10 @@
196N/A setting:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [pager]
196N/A quiet = True
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can disable the pager for certain commands by adding them to the
196N/A@@ -7763,10 +7737,10 @@
196N/A pager.ignore list:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [pager]
196N/A ignore = version, help, update
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can also enable the pager only for certain commands using
196N/A@@ -7773,10 +7747,10 @@
196N/A pager.attend. Below is the default list of commands to be paged:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [pager]
196N/A attend = annotate, cat, diff, export, glog, log, qdiff
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Setting pager.attend to an empty value will cause all commands to be
196N/A@@ -7784,7 +7758,7 @@
196N/A .sp
196N/A If pager.attend is present, pager.ignore will be ignored.
196N/A .sp
196N/A-To ignore global commands like \%\fBhg version\fP\: or \%\fBhg help\fP\:, you have
196N/A+To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have
196N/A to specify them in your user configuration file.
196N/A .sp
196N/A The \-\-pager=... option can also be used to control when the pager is
196N/A@@ -7800,7 +7774,7 @@
196N/A For example, if you can refer to a revision as "foo", then:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A foo^N = Nth parent of foo
196N/A foo^0 = foo
196N/A foo^1 = first parent of foo
196N/A@@ -7811,7 +7785,7 @@
196N/A foo~0 = foo
196N/A foo~1 = foo^1 = foo^ = first parent of foo
196N/A foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS patchbomb
196N/A .sp
196N/A@@ -7832,7 +7806,7 @@
196N/A [Optional] The result of running diffstat on the patch.
196N/A .IP \(bu 2
196N/A .
196N/A-The patch itself, as generated by \%\fBhg export\fP\:.
196N/A+The patch itself, as generated by \fBhg export\fP.
196N/A .UNINDENT
196N/A .sp
196N/A Each message refers to the first in the series using the In\-Reply\-To
196N/A@@ -7843,7 +7817,7 @@
196N/A configuration file:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [email]
196N/A from = My Name <my@email>
196N/A to = recipient1, recipient2, ...
196N/A@@ -7850,13 +7824,13 @@
196N/A cc = cc1, cc2, ...
196N/A bcc = bcc1, bcc2, ...
196N/A reply\-to = address1, address2, ...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Use \fB[patchbomb]\fP as configuration section name if you need to
196N/A override global \fB[email]\fP address settings.
196N/A .sp
196N/A-Then you can use the \%\fBhg email\fP\: command to mail a series of
196N/A+Then you can use the \fBhg email\fP command to mail a series of
196N/A changesets as a patchbomb.
196N/A .sp
196N/A You can also either configure the method option in the email section
196N/A@@ -7868,13 +7842,13 @@
196N/A .SS email
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg email [OPTION]... [DEST]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A By default, diffs are sent in the format generated by
196N/A-\%\fBhg export\fP\:, one per message. The series starts with a "[PATCH 0
196N/A+\fBhg export\fP, one per message. The series starts with a "[PATCH 0
196N/A of N]" introduction, which describes the series as a whole.
196N/A .sp
196N/A Each patch email has a Subject line of "[PATCH M of N] ...", using
196N/A@@ -7885,7 +7859,7 @@
196N/A With the \-d/\-\-diffstat option, if the diffstat program is
196N/A installed, the result of running diffstat on the patch is inserted.
196N/A .sp
196N/A-Finally, the patch itself, as generated by \%\fBhg export\fP\:.
196N/A+Finally, the patch itself, as generated by \fBhg export\fP.
196N/A .sp
196N/A With the \-d/\-\-diffstat or \-c/\-\-confirm options, you will be presented
196N/A with a final summary of all messages and asked for confirmation before
196N/A@@ -7923,7 +7897,7 @@
196N/A Examples:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg email \-r 3000 # send patch 3000 only
196N/A hg email \-r 3000 \-r 3001 # send patches 3000 and 3001
196N/A hg email \-r 3000:3005 # send patches 3000 through 3005
196N/A@@ -7944,7 +7918,7 @@
196N/A hg email \-o \-m mbox && # generate an mbox file ...
196N/A formail \-s sendmail \e # ... and use formail to send from the mbox
196N/A \-bm \-t < mbox # ... using sendmail
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Before using this command, you will need to enable email in your
196N/A@@ -8077,7 +8051,7 @@
196N/A The following settings are available:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [progress]
196N/A delay = 3 # number of seconds (float) before showing the progress bar
196N/A refresh = 0.1 # time in seconds between refreshes of the progress bar
196N/A@@ -8084,11 +8058,11 @@
196N/A format = topic bar number estimate # format of the progress bar
196N/A width = <none> # if set, the maximum width of the progress information
196N/A # (that is, min(width, term width) will be used)
196N/A-clear\-complete = True # clear the progress bar after it\(aqs done
196N/A-disable = False # if true, don\(aqt show a progress bar
196N/A+clear\-complete = True # clear the progress bar after it's done
196N/A+disable = False # if true, don't show a progress bar
196N/A assume\-tty = False # if true, ALWAYS show a progress bar, unless
196N/A # disable is given
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Valid entries for the format field are topic, bar, number, unit,
196N/A@@ -8103,9 +8077,9 @@
196N/A .SS purge
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg purge [OPTION]... [DIR]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Delete files not known to Mercurial. This is useful to test local
196N/A@@ -8115,7 +8089,7 @@
196N/A .INDENT 0.0
196N/A .IP \(bu 2
196N/A .
196N/A-Unknown files: files marked with "?" by \%\fBhg status\fP\:
196N/A+Unknown files: files marked with "?" by \fBhg status\fP
196N/A .IP \(bu 2
196N/A .
196N/A Empty directories: in fact Mercurial ignores directories unless
196N/A@@ -8132,7 +8106,7 @@
196N/A Ignored files (unless \-\-all is specified)
196N/A .IP \(bu 2
196N/A .
196N/A-New files added to the repository (with \%\fBhg add\fP\:)
196N/A+New files added to the repository (with \fBhg add\fP)
196N/A .UNINDENT
196N/A .sp
196N/A If directories are given on the command line, only files in these
196N/A@@ -8180,15 +8154,15 @@
196N/A repository.
196N/A .sp
196N/A For more information:
196N/A-\%http://mercurial.selenic.com/wiki/RebaseExtension\:
196N/A+http://mercurial.selenic.com/wiki/RebaseExtension
196N/A .SS Commands
196N/A .SS rebase
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg rebase [\-s REV | \-b REV] [\-d REV] [options]
196N/A hg rebase {\-a|\-c}
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Rebase uses repeated merging to graft changesets from one part of
196N/A@@ -8201,7 +8175,7 @@
196N/A same rebase or they will end up with duplicated changesets after
196N/A pulling in your rebased changesets.
196N/A .sp
196N/A-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP),
196N/A+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP),
196N/A rebase uses the tipmost head of the current named branch as the
196N/A destination. (The destination changeset is not modified by
196N/A rebasing, but new changesets are added as its descendants.)
196N/A@@ -8228,7 +8202,7 @@
196N/A and source branch is that, unlike \fBmerge\fP, rebase will do
196N/A nothing if you are at the latest (tipmost) head of a named branch
196N/A with two heads. You need to explicitly specify source and/or
196N/A-destination (or \fBupdate\fP to the other head, if it\(aqs the head of
196N/A+destination (or \fBupdate\fP to the other head, if it's the head of
196N/A the intended source branch).
196N/A .sp
196N/A If a rebase is interrupted to manually resolve a merge, it can be
196N/A@@ -8290,15 +8264,15 @@
196N/A .SS record
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg record [OPTION]... [FILE]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
196N/A+If a list of files is omitted, all changes reported by \fBhg status\fP
196N/A will be candidates for recording.
196N/A .sp
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A .sp
196N/A You will be prompted for whether to record changes to each
196N/A modified file, and for files with multiple changes, for each
196N/A@@ -8306,7 +8280,7 @@
196N/A possible:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A y \- record this change
196N/A n \- skip this change
196N/A
196N/A@@ -8318,7 +8292,7 @@
196N/A q \- quit, recording no changes
196N/A
196N/A ? \- display help
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This command is not available when committing a merge.
196N/A@@ -8365,9 +8339,9 @@
196N/A .SS relink
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg relink [ORIGIN]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A When repositories are cloned locally, their data files will be
196N/A@@ -8399,18 +8373,18 @@
196N/A lot of repositories to act like a scheme, for example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [schemes]
196N/A py = http://code.python.org/hg/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A After that you can use it like:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg clone py://trunk/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Additionally there is support for some more complex schemas, for
196N/A@@ -8417,10 +8391,10 @@
196N/A example used by Google Code:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [schemes]
196N/A gcode = http://{1}.googlecode.com/hg/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The syntax is taken from Mercurial templates, and you have unlimited
196N/A@@ -8432,7 +8406,7 @@
196N/A For convenience, the extension adds these schemes by default:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [schemes]
196N/A py = http://hg.python.org/
196N/A bb = https://bitbucket.org/
196N/A@@ -8439,7 +8413,7 @@
196N/A bb+ssh = ssh://hg@bitbucket.org/
196N/A gcode = https://{1}.googlecode.com/hg/
196N/A kiln = https://{1}.kilnhg.com/Repo/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can override a predefined scheme by defining a new scheme with the
196N/A@@ -8451,9 +8425,9 @@
196N/A .SS share
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg share [\-U] SOURCE [DEST]
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Initialize a new repository and working directory that shares its
196N/A@@ -8490,9 +8464,9 @@
196N/A .SS transplant
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hg transplant [\-s REPO] [\-b BRANCH [\-a]] [\-p REV] [\-m REV] [REV]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Selected changesets will be applied on top of the current working
196N/A@@ -8505,9 +8479,9 @@
196N/A of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A (transplanted from CHANGESETHASH)
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can rewrite the changelog message with the \-\-filter option.
196N/A@@ -8521,7 +8495,7 @@
196N/A transplanted, otherwise you will be prompted to select the
196N/A changesets you want.
196N/A .sp
196N/A-\%\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the
196N/A+\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the
196N/A selected branch (up to the named revision) onto your current
196N/A working directory.
196N/A .sp
196N/A@@ -8530,12 +8504,12 @@
196N/A of a merged transplant, and you can merge descendants of them
196N/A normally instead of transplanting them.
196N/A .sp
196N/A-If no merges or revisions are provided, \%\fBhg transplant\fP\: will
196N/A+If no merges or revisions are provided, \fBhg transplant\fP will
196N/A start an interactive changeset browser.
196N/A .sp
196N/A If a changeset application fails, you can fix the merge by hand
196N/A-and then resume where you left off by calling \%\fBhg transplant
196N/A-\-\-continue/\-c\fP\:.
196N/A+and then resume where you left off by calling \fBhg transplant
196N/A+\-\-continue/\-c\fP.
196N/A .sp
196N/A Options:
196N/A .INDENT 0.0
196N/A@@ -8624,10 +8598,10 @@
196N/A You can specify the encoding by config option:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [win32mbcs]
196N/A encoding = sjis
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A It is useful for the users who want to commit with UTF\-8 log message.
196N/A@@ -8650,7 +8624,7 @@
196N/A To perform automatic newline conversion, use:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A win32text =
196N/A [encode]
196N/A@@ -8660,17 +8634,17 @@
196N/A [decode]
196N/A ** = cleverdecode:
196N/A # or ** = macdecode:
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A If not doing conversion, to make sure you do not commit CRLF/CR by accident:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hooks]
196N/A pretxncommit.crlf = python:hgext.win32text.forbidcrlf
196N/A # or pretxncommit.cr = python:hgext.win32text.forbidcr
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A To do the same check on a server to prevent CRLF/CR from being
196N/A@@ -8677,11 +8651,11 @@
196N/A pushed or pulled:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hooks]
196N/A pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
196N/A # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS zeroconf
196N/A .sp
196N/A@@ -8692,23 +8666,23 @@
196N/A without knowing their actual IP address.
196N/A .sp
196N/A To allow other people to discover your repository using run
196N/A-\%\fBhg serve\fP\: in your repository:
196N/A+\fBhg serve\fP in your repository:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ cd test
196N/A $ hg serve
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A You can discover Zeroconf\-enabled repositories by running
196N/A-\%\fBhg paths\fP\::
196N/A+\fBhg paths\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ hg paths
196N/A zc\-test = http://example.com:8000/test
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SH FILES
196N/A .INDENT 0.0
196N/A@@ -8717,7 +8691,7 @@
196N/A .sp
196N/A This file contains regular expressions (one per line) that
196N/A describe file names that should be ignored by \fBhg\fP. For details,
196N/A-see \%\fBhgignore\fP(5)\:.
196N/A+see \fBhgignore\fP(5).
196N/A .TP
196N/A .B \fB.hgtags\fP
196N/A .sp
196N/A@@ -8730,7 +8704,7 @@
196N/A This file contains defaults and configuration. Values in
196N/A \fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
196N/A settings made in the global \fB/etc/mercurial/hgrc\fP configuration.
196N/A-See \%\fBhgrc\fP(5)\: for details of the contents and format of these
196N/A+See \fBhgrc\fP(5) for details of the contents and format of these
196N/A files.
196N/A .UNINDENT
196N/A .sp
196N/A@@ -8737,23 +8711,28 @@
196N/A Some commands (e.g. revert) produce backup files ending in \fB.orig\fP,
196N/A if the \fB.orig\fP file already exists and is not tracked by Mercurial,
196N/A it will be overwritten.
196N/A+.TP
196N/A+.B /usr/demo/mercurial
196N/A+This directory contains assorted files which are part of the Mercurial
196N/A+distribution, but not core to its functionality. They will generally
196N/A+need to be copied elsewhere to be of use.
196N/A .SH BUGS
196N/A .sp
196N/A-Probably lots, please post them to the mailing list (see \%Resources\:
196N/A+Probably lots, please post them to the mailing list (see Resources
196N/A below) when you find them.
196N/A .SH SEE ALSO
196N/A .sp
196N/A-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\:
196N/A+\fBhgignore\fP(5), \fBhgrc\fP(5)
196N/A .SH AUTHOR
196N/A .sp
196N/A-Written by Matt Mackall <\%mpm@selenic.com\:>
196N/A+Written by Matt Mackall <mpm@selenic.com>
196N/A .SH RESOURCES
196N/A .sp
196N/A-Main Web Site: \%http://mercurial.selenic.com/\:
196N/A+Main Web Site: http://mercurial.selenic.com/
196N/A .sp
196N/A-Source code repository: \%http://selenic.com/hg\:
196N/A+Source code repository: http://selenic.com/hg
196N/A .sp
196N/A-Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
196N/A+Mailing list: http://selenic.com/mailman/listinfo/mercurial
196N/A .SH COPYING
196N/A .sp
196N/A Copyright (C) 2005\-2010 Matt Mackall.
196N/A--- mercurial-1.8/doc/hgignore.5 Tue Mar 1 14:01:42 2011
196N/A+++ mercurial-1.8/doc/hgignore.5 Mon Mar 7 21:16:24 2011
196N/A@@ -1,35 +1,9 @@
196N/A+'\" t
196N/A .\" Man page generated from reStructeredText.
196N/A .
196N/A .TH HGIGNORE 5 "" "" "Mercurial Manual"
196N/A .SH NAME
196N/A hgignore \- syntax for Mercurial ignore files
196N/A-.
196N/A-.nr rst2man-indent-level 0
196N/A-.
196N/A-.de1 rstReportMargin
196N/A-\\$1 \\n[an-margin]
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A--
196N/A-\\n[rst2man-indent0]
196N/A-\\n[rst2man-indent1]
196N/A-\\n[rst2man-indent2]
196N/A-..
196N/A-.de1 INDENT
196N/A-.\" .rstReportMargin pre:
196N/A-. RS \\$1
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-..
196N/A-.de UNINDENT
196N/A-. RE
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.nr rst2man-indent-level -1
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A-..
196N/A .SH SYNOPSIS
196N/A .sp
196N/A The Mercurial system uses a file called \fB.hgignore\fP in the root
196N/A@@ -54,12 +28,12 @@
196N/A if any pattern in \fB.hgignore\fP matches \fBa/b/file.c\fP, \fBa/b\fP or \fBa\fP.
196N/A .sp
196N/A In addition, a Mercurial configuration file can reference a set of
196N/A-per\-user or global ignore files. See the \%\fBhgrc\fP(5)\: man page for details
196N/A+per\-user or global ignore files. See the \fBhgrc\fP(5) man page for details
196N/A of how to configure these files. Look for the "ignore" entry in the
196N/A "ui" section.
196N/A .sp
196N/A-To control Mercurial\(aqs handling of files that it manages, see the
196N/A-\%\fBhg\fP(1)\: man page. Look for the \fB\-I\fP and \fB\-X\fP options.
196N/A+To control Mercurial's handling of files that it manages, see the
196N/A+\fBhg\fP(1) man page. Look for the \fB\-I\fP and \fB\-X\fP options.
196N/A .SH SYNTAX
196N/A .sp
196N/A An ignore file is a plain text file consisting of a list of patterns,
196N/A@@ -73,9 +47,9 @@
196N/A To change the syntax used, use a line of the following form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A syntax: NAME
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A where \fBNAME\fP is one of the following:
196N/A@@ -102,7 +76,7 @@
196N/A Here is an example ignore file.
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A # use glob syntax.
196N/A syntax: glob
196N/A
196N/A@@ -113,16 +87,16 @@
196N/A # switch to regexp syntax.
196N/A syntax: regexp
196N/A ^\e.pc/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SH AUTHOR
196N/A .sp
196N/A-Vadim Gelfer <\%vadim.gelfer@gmail.com\:>
196N/A+Vadim Gelfer <vadim.gelfer@gmail.com>
196N/A .sp
196N/A-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
196N/A+Mercurial was written by Matt Mackall <mpm@selenic.com>.
196N/A .SH SEE ALSO
196N/A .sp
196N/A-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
196N/A+\fBhg\fP(1), \fBhgrc\fP(5)
196N/A .SH COPYING
196N/A .sp
196N/A This manual page is copyright 2006 Vadim Gelfer.
196N/A--- mercurial-1.8.1/doc/hgrc.5 Thu Mar 10 09:30:43 2011
196N/A+++ mercurial-1.8.1/doc/hgrc.5 Mon Mar 7 21:24:26 2011
196N/A@@ -1,35 +1,9 @@
196N/A+'\" t
196N/A .\" Man page generated from reStructeredText.
196N/A .
196N/A .TH HGRC 5 "" "" "Mercurial Manual"
196N/A .SH NAME
196N/A hgrc \- configuration files for Mercurial
196N/A-.
196N/A-.nr rst2man-indent-level 0
196N/A-.
196N/A-.de1 rstReportMargin
196N/A-\\$1 \\n[an-margin]
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A--
196N/A-\\n[rst2man-indent0]
196N/A-\\n[rst2man-indent1]
196N/A-\\n[rst2man-indent2]
196N/A-..
196N/A-.de1 INDENT
196N/A-.\" .rstReportMargin pre:
196N/A-. RS \\$1
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-..
196N/A-.de UNINDENT
196N/A-. RE
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.nr rst2man-indent-level -1
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A-..
196N/A .SH SYNOPSIS
196N/A .sp
196N/A The Mercurial system uses a set of configuration files to control
196N/A@@ -44,7 +18,7 @@
196N/A ones.
196N/A .sp
196N/A .nf
196N/A-(Unix, Windows) \fB<repo>/.hg/hgrc\fP
196N/A+\fB<repo>/.hg/hgrc\fP
196N/A .fi
196N/A .sp
196N/A .INDENT 0.0
196N/A@@ -53,35 +27,30 @@
196N/A Per\-repository configuration options that only apply in a
196N/A particular repository. This file is not version\-controlled, and
196N/A will not get transferred during a "clone" operation. Options in
196N/A-this file override options in all other configuration files. On
196N/A-Unix, most of this file will be ignored if it doesn\(aqt belong to a
196N/A+this file override options in all other configuration files.
196N/A+Most of this file will be ignored if it doesn't belong to a
196N/A trusted user or to a trusted group. See the documentation for the
196N/A-\%trusted\: section below for more details.
196N/A+trusted section below for more details.
196N/A .UNINDENT
196N/A .UNINDENT
196N/A .sp
196N/A .nf
196N/A-(Unix) \fB$HOME/.hgrc\fP
196N/A-(Windows) \fB%USERPROFILE%\e.hgrc\fP
196N/A-(Windows) \fB%USERPROFILE%\eMercurial.ini\fP
196N/A-(Windows) \fB%HOME%\e.hgrc\fP
196N/A-(Windows) \fB%HOME%\eMercurial.ini\fP
196N/A+\fB$HOME/.hgrc\fP
196N/A .fi
196N/A .sp
196N/A .INDENT 0.0
196N/A .INDENT 3.5
196N/A .sp
196N/A-Per\-user configuration file(s), for the user running Mercurial. On
196N/A-Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
196N/A-files apply to all Mercurial commands executed by this user in any
196N/A-directory. Options in these files override per\-system and per\-installation
196N/A-options.
196N/A+Per\-user configuration file(s), for the user running Mercurial.
196N/A+Options in this file apply to all Mercurial commands executed by this
196N/A+user in any directory. Options in this file override per\-system and
196N/A+per\-installation options.
196N/A .UNINDENT
196N/A .UNINDENT
196N/A .sp
196N/A .nf
196N/A-(Unix) \fB/etc/mercurial/hgrc\fP
196N/A-(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP
196N/A+\fB/etc/mercurial/hgrc\fP
196N/A+\fB/etc/mercurial/hgrc.d/*.rc\fP
196N/A .fi
196N/A .sp
196N/A .INDENT 0.0
196N/A@@ -93,44 +62,6 @@
196N/A override per\-installation options.
196N/A .UNINDENT
196N/A .UNINDENT
196N/A-.sp
196N/A-.nf
196N/A-(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
196N/A-(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
196N/A-.fi
196N/A-.sp
196N/A-.INDENT 0.0
196N/A-.INDENT 3.5
196N/A-.sp
196N/A-Per\-installation configuration files, searched for in the
196N/A-directory where Mercurial is installed. \fB<install\-root>\fP is the
196N/A-parent directory of the \fBhg\fP executable (or symlink) being run. For
196N/A-example, if installed in \fB/shared/tools/bin/hg\fP, Mercurial will look
196N/A-in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply
196N/A-to all Mercurial commands executed by any user in any directory.
196N/A-.UNINDENT
196N/A-.UNINDENT
196N/A-.sp
196N/A-.nf
196N/A-(Windows) \fB<install\-dir>\eMercurial.ini\fP
196N/A-(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP
196N/A-(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP
196N/A-.fi
196N/A-.sp
196N/A-.INDENT 0.0
196N/A-.INDENT 3.5
196N/A-.sp
196N/A-Per\-installation/system configuration files, for the system on
196N/A-which Mercurial is running. Options in these files apply to all
196N/A-Mercurial commands executed by any user in any directory. Registry
196N/A-keys contain PATH\-like strings, every part of which must reference
196N/A-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
196N/A-be read. Mercurial checks each of these locations in the specified
196N/A-order until one or more configuration files are detected. If the
196N/A-pywin32 extensions are not installed, Mercurial will only look for
196N/A-site\-wide configuration in \fBC:\eMercurial\eMercurial.ini\fP.
196N/A-.UNINDENT
196N/A-.UNINDENT
196N/A .SH SYNTAX
196N/A .sp
196N/A A configuration file consists of sections, led by a \fB[section]\fP header
196N/A@@ -138,12 +69,12 @@
196N/A \fBconfiguration keys\fP):
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [spam]
196N/A eggs=ham
196N/A green=
196N/A eggs
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Each line contains one entry. If the lines that follow are indented,
196N/A@@ -155,12 +86,12 @@
196N/A will use the value that was configured last. As an example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [spam]
196N/A eggs=large
196N/A ham=serrano
196N/A eggs=small
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
196N/A@@ -169,7 +100,7 @@
196N/A be redefined on the same and/or on different hgrc files. For example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [foo]
196N/A eggs=large
196N/A ham=serrano
196N/A@@ -184,7 +115,7 @@
196N/A ham=prosciutto
196N/A eggs=medium
196N/A bread=toasted
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
196N/A@@ -206,9 +137,9 @@
196N/A \fBfile\fP. This lets you do something like:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A %include ~/.hgrc.d/$HOST.rc
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A to include a different configuration file on each computer you use.
196N/A@@ -225,9 +156,9 @@
196N/A placed in double quotation marks:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A allow_read = "John Doe, PhD", brian, betty
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Quotation marks can be escaped by prefixing them with a backslash. Only
196N/A@@ -247,17 +178,17 @@
196N/A Alias definitions consist of lines of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A <alias> = <command> [<argument]...
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A For example, this definition:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A latest = log \-\-limit 5
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A creates a new command \fBlatest\fP that shows only the five most recent
196N/A@@ -264,9 +195,9 @@
196N/A changesets. You can define subsequent aliases using earlier ones:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A stable5 = latest \-b stable
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .IP Note
196N/A .
196N/A@@ -278,15 +209,15 @@
196N/A .sp
196N/A Authentication credentials for HTTP authentication. This section
196N/A allows you to store usernames and passwords for use when logging
196N/A-\fIinto\fP HTTP servers. See the \%web\: configuration section if you want to
196N/A+\fIinto\fP HTTP servers. See the web configuration section if you want to
196N/A configure \fIwho\fP can login to your HTTP server.
196N/A .sp
196N/A Each line has the following format:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A <name>.<argument> = <value>
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A where \fB<name>\fP is used to group arguments into authentication
196N/A@@ -293,7 +224,7 @@
196N/A entries. Example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A foo.prefix = hg.intevation.org/mercurial
196N/A foo.username = foo
196N/A foo.password = bar
196N/A@@ -303,7 +234,7 @@
196N/A bar.key = path/to/file.key
196N/A bar.cert = path/to/file.cert
196N/A bar.schemes = https
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Supported arguments:
196N/A@@ -314,7 +245,7 @@
196N/A Either \fB*\fP or a URI prefix with or without the scheme part.
196N/A The authentication entry with the longest matching prefix is used
196N/A (where \fB*\fP matches everything and counts as a match of length
196N/A-1). If the prefix doesn\(aqt include a scheme, the match is performed
196N/A+1). If the prefix doesn't include a scheme, the match is performed
196N/A against the URI with its scheme stripped as well, and the schemes
196N/A argument, q.v., is then subsequently consulted.
196N/A .TP
196N/A@@ -344,7 +275,7 @@
196N/A .B \fBschemes\fP
196N/A .sp
196N/A Optional. Space separated list of URI schemes to use this
196N/A-authentication entry with. Only used if the prefix doesn\(aqt include
196N/A+authentication entry with. Only used if the prefix doesn't include
196N/A a scheme. Supported schemes are http and https. They will match
196N/A static\-http and static\-https respectively, as well.
196N/A Default: https.
196N/A@@ -374,7 +305,7 @@
196N/A Pipe example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [encode]
196N/A # uncompress gzip files on checkin to improve delta compression
196N/A # note: not necessarily a good idea, just an example
196N/A@@ -382,9 +313,9 @@
196N/A
196N/A [decode]
196N/A # recompress gzip files when writing them to the working dir (we
196N/A-# can safely omit "pipe:", because it\(aqs the default)
196N/A+# can safely omit "pipe:", because it's the default)
196N/A *.gz = gzip
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
196N/A@@ -392,12 +323,6 @@
196N/A filtered by the command. The string \fBOUTFILE\fP is replaced with the name
196N/A of an empty temporary file, where the filtered data must be written by
196N/A the command.
196N/A-.IP Note
196N/A-.
196N/A-The tempfile mechanism is recommended for Windows systems,
196N/A-where the standard shell I/O redirection operators often have
196N/A-strange effects and may corrupt the contents of your files.
196N/A-.RE
196N/A .sp
196N/A This filter mechanism is used internally by the \fBeol\fP extension to
196N/A translate line ending characters between Windows (CRLF) and Unix (LF)
196N/A@@ -404,20 +329,20 @@
196N/A format. We suggest you use the \fBeol\fP extension for convenience.
196N/A .SS \fBdefaults\fP
196N/A .sp
196N/A-(defaults are deprecated. Don\(aqt use them. Use aliases instead)
196N/A+(defaults are deprecated. Don't use them. Use aliases instead)
196N/A .sp
196N/A Use the \fB[defaults]\fP section to define command defaults, i.e. the
196N/A default options/arguments to pass to the specified commands.
196N/A .sp
196N/A-The following example makes \%\fBhg log\fP\: run in verbose mode, and
196N/A-\%\fBhg status\fP\: show only the modified files, by default:
196N/A+The following example makes \fBhg log\fP run in verbose mode, and
196N/A+\fBhg status\fP show only the modified files, by default:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [defaults]
196N/A log = \-v
196N/A status = \-m
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A The actual commands, instead of their aliases, must be used when
196N/A@@ -435,7 +360,7 @@
196N/A .TP
196N/A .B \fBnodates\fP
196N/A .sp
196N/A-Don\(aqt include dates in diff headers.
196N/A+Don't include dates in diff headers.
196N/A .TP
196N/A .B \fBshowfunc\fP
196N/A .sp
196N/A@@ -469,22 +394,22 @@
196N/A .TP
196N/A .B \fBto\fP
196N/A .sp
196N/A-Optional. Comma\-separated list of recipients\(aq email addresses.
196N/A+Optional. Comma\-separated list of recipients' email addresses.
196N/A .TP
196N/A .B \fBcc\fP
196N/A .sp
196N/A-Optional. Comma\-separated list of carbon copy recipients\(aq
196N/A+Optional. Comma\-separated list of carbon copy recipients'
196N/A email addresses.
196N/A .TP
196N/A .B \fBbcc\fP
196N/A .sp
196N/A-Optional. Comma\-separated list of blind carbon copy recipients\(aq
196N/A+Optional. Comma\-separated list of blind carbon copy recipients'
196N/A email addresses.
196N/A .TP
196N/A .B \fBmethod\fP
196N/A .sp
196N/A Optional. Method to use to send email messages. If value is \fBsmtp\fP
196N/A-(default), use SMTP (see the \%SMTP\: section for configuration).
196N/A+(default), use SMTP (see the SMTP section for configuration).
196N/A Otherwise, use as name of program to run that acts like sendmail
196N/A (takes \fB\-f\fP option for sender, list of recipients on command line,
196N/A message on stdin). Normally, setting this to \fBsendmail\fP or
196N/A@@ -523,7 +448,7 @@
196N/A Email example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [email]
196N/A from = Joseph User <joe.user@example.com>
196N/A method = /usr/sbin/sendmail
196N/A@@ -530,7 +455,7 @@
196N/A # charsets for western Europeans
196N/A # us\-ascii, utf\-8 omitted, as they are tried first and last
196N/A charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS \fBextensions\fP
196N/A .sp
196N/A@@ -537,7 +462,7 @@
196N/A Mercurial has an extension mechanism for adding new features. To
196N/A enable an extension, create an entry for it in this section.
196N/A .sp
196N/A-If you know that the extension is already in Python\(aqs search path,
196N/A+If you know that the extension is already in Python's search path,
196N/A you can give the name of the module, followed by \fB=\fP, with nothing
196N/A after the \fB=\fP.
196N/A .sp
196N/A@@ -553,13 +478,13 @@
196N/A Example for \fB~/.hgrc\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [extensions]
196N/A-# (the mq extension will get loaded from Mercurial\(aqs path)
196N/A+# (the mq extension will get loaded from Mercurial's path)
400N/A mq =
196N/A # (this extension will get loaded from the file specified)
196N/A myfeature = ~/.hgext/myfeature.py
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS \fBhostfingerprints\fP
196N/A .sp
196N/A@@ -573,10 +498,10 @@
196N/A For example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hostfingerprints]
196N/A hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This feature is only supported when using Python 2.6 or later.
196N/A@@ -620,11 +545,11 @@
196N/A Example:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [merge\-patterns]
196N/A **.c = kdiff3
196N/A **.jpg = myimgmerge
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .SS \fBmerge\-tools\fP
196N/A .sp
196N/A@@ -634,7 +559,7 @@
196N/A Example \fB~/.hgrc\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [merge\-tools]
196N/A # Override stock tool location
196N/A kdiff3.executable = ~/bin/kdiff3
196N/A@@ -647,7 +572,7 @@
196N/A myHtmlTool.args = \-m $local $other $base $output
196N/A myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
196N/A myHtmlTool.priority = 1
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Supported arguments:
196N/A@@ -660,8 +585,7 @@
196N/A .TP
196N/A .B \fBexecutable\fP
196N/A .sp
196N/A-Either just the name of the executable or its pathname. On Windows,
196N/A-the path can use environment variables with ${ProgramFiles} syntax.
196N/A+Either just the name of the executable or its pathname.
196N/A Default: the tool name.
196N/A .TP
196N/A .B \fBargs\fP
196N/A@@ -724,32 +648,6 @@
196N/A .B \fBgui\fP
196N/A .sp
196N/A This tool requires a graphical interface to run. Default: False
196N/A-.TP
196N/A-.B \fBregkey\fP
196N/A-.sp
196N/A-Windows registry key which describes install location of this
196N/A-tool. Mercurial will search for this key first under
196N/A-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
196N/A-Default: None
196N/A-.TP
196N/A-.B \fBregkeyalt\fP
196N/A-.sp
196N/A-An alternate Windows registry key to try if the first key is not
196N/A-found. The alternate key uses the same \fBregname\fP and \fBregappend\fP
196N/A-semantics of the primary key. The most common use for this key
196N/A-is to search for 32bit applications on 64bit operating systems.
196N/A-Default: None
196N/A-.TP
196N/A-.B \fBregname\fP
196N/A-.sp
196N/A-Name of value to read from specified registry key. Defaults to the
196N/A-unnamed (default) value.
196N/A-.TP
196N/A-.B \fBregappend\fP
196N/A-.sp
196N/A-String to append to the value read from the registry, typically
196N/A-the executable name of the tool.
196N/A-Default: None
196N/A .UNINDENT
196N/A .SS \fBhooks\fP
196N/A .sp
196N/A@@ -762,7 +660,7 @@
196N/A Example \fB.hg/hgrc\fP:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A [hooks]
196N/A # update working directory after adding changesets
196N/A changegroup.update = hg update
196N/A@@ -770,7 +668,7 @@
196N/A incoming =
196N/A incoming.email = /my/email/hook
196N/A incoming.autobuild = /my/build/hook
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Most hooks are run with environment variables set that give useful
196N/A@@ -820,7 +718,7 @@
196N/A representations of the data internally passed to <command>. \fB$HG_OPTS\fP
196N/A is a dictionary of options (with unspecified options set to their
196N/A defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
196N/A-failure, the command doesn\(aqt execute and Mercurial returns the failure
196N/A+failure, the command doesn't execute and Mercurial returns the failure
196N/A code.
196N/A .TP
196N/A .B \fBprechangegroup\fP
196N/A@@ -902,21 +800,14 @@
196N/A Also, hooks like "commit" will be called in all contexts that
196N/A generate a commit (e.g. tag) and not just the commit command.
99N/A .RE
196N/A-.IP Note
196N/A-.
196N/A-Environment variables with empty values may not be passed to
196N/A-hooks on platforms such as Windows. As an example, \fB$HG_PARENT2\fP
196N/A-will have an empty value under Unix\-like platforms for non\-merge
196N/A-changesets, while it will not be available at all under Windows.
196N/A-.RE
196N/A .sp
196N/A The syntax for Python hooks is as follows:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A hookname = python:modulename.submodule.callable
196N/A hookname = python:/path/to/python/module.py:callable
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Python hooks are run within the Mercurial process. Each hook is
196N/A@@ -988,18 +879,18 @@
196N/A .TP
196N/A .B \fBlocal_hostname\fP
196N/A .sp
196N/A-Optional. It\(aqs the hostname that the sender can use to identify
196N/A+Optional. It's the hostname that the sender can use to identify
196N/A itself to the MTA.
196N/A .UNINDENT
196N/A .SS \fBpatch\fP
196N/A .sp
196N/A-Settings used when applying patches, for instance through the \(aqimport\(aq
196N/A+Settings used when applying patches, for instance through the 'import'
196N/A command or with Mercurial Queues extension.
196N/A .INDENT 0.0
196N/A .TP
196N/A .B \fBeol\fP
196N/A .sp
196N/A-When set to \(aqstrict\(aq patch content and patched files end of lines
196N/A+When set to 'strict' patch content and patched files end of lines
196N/A are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
196N/A lines are ignored when patching and the result line endings are
196N/A normalized to either LF (Unix) or CRLF (Windows). When set to
196N/A@@ -1031,8 +922,8 @@
196N/A .SS \fBprofiling\fP
196N/A .sp
196N/A Specifies profiling format and file output. In this section
196N/A-description, \(aqprofiling data\(aq stands for the raw data collected
196N/A-during profiling, while \(aqprofiling report\(aq stands for a statistical
196N/A+description, 'profiling data' stands for the raw data collected
196N/A+during profiling, while 'profiling report' stands for a statistical
196N/A text report generated from the profiling data. The profiling is done
196N/A using lsprof.
196N/A .INDENT 0.0
196N/A@@ -1091,9 +982,9 @@
196N/A Defines subrepositories source locations rewriting rules of the form:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A <pattern> = <replacement>
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Where \fBpattern\fP is a regular expression matching the source and
196N/A@@ -1102,9 +993,9 @@
196N/A instance:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A http://server/(.*)\-hg/ = http://hg.server/\e1/
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
196N/A@@ -1112,8 +1003,8 @@
196N/A All patterns are applied in definition order.
196N/A .SS \fBtrusted\fP
196N/A .sp
196N/A-Mercurial will not use the settings in the
196N/A-\fB.hg/hgrc\fP file from a repository if it doesn\(aqt belong to a trusted
196N/A+Mercurial will not use the settings in the \fB.hg/hgrc\fP file from a
196N/A+repository if it doesn't belong to a trusted
196N/A user or to a trusted group, as various hgrc features allow arbitrary
196N/A commands to be run. This issue is often encountered when configuring
196N/A hooks or extensions for shared repositories or servers. However,
196N/A@@ -1144,7 +1035,7 @@
196N/A .sp
196N/A Whether to include the .hg_archival.txt file containing meta data
196N/A (hashes for the repository base and for tip) in archives created
196N/A-by the \%\fBhg archive\fP\: command or downloaded via hgweb.
196N/A+by the \fBhg archive\fP command or downloaded via hgweb.
196N/A Default is True.
196N/A .TP
196N/A .B \fBaskusername\fP
196N/A@@ -1172,7 +1063,7 @@
196N/A .TP
196N/A .B \fBfallbackencoding\fP
196N/A .sp
196N/A-Encoding to try if it\(aqs not possible to decode the changelog using
196N/A+Encoding to try if it's not possible to decode the changelog using
196N/A UTF\-8. Default is ISO\-8859\-1.
196N/A .TP
196N/A .B \fBignore\fP
196N/A@@ -1182,7 +1073,7 @@
196N/A option supports hook syntax, so if you want to specify multiple
196N/A ignore files, you can do so by setting something like
196N/A \fBignore.other = ~/.hgignore2\fP. For details of the ignore file
196N/A-format, see the \%\fBhgignore\fP(5)\: man page.
196N/A+format, see the \fBhgignore\fP(5) man page.
196N/A .TP
196N/A .B \fBinteractive\fP
196N/A .sp
196N/A@@ -1195,8 +1086,8 @@
196N/A .B \fBmerge\fP
196N/A .sp
196N/A The conflict resolution program to use during a manual merge.
196N/A-For more information on merge tools see \%\fBhg help merge\-tools\fP\:.
196N/A-For configuring merge tools see the \%merge\-tools\: section.
196N/A+For more information on merge tools see \fBhg help merge\-tools\fP.
196N/A+For configuring merge tools see the merge\-tools section.
196N/A .TP
196N/A .B \fBpatch\fP
196N/A .sp
196N/A@@ -1252,7 +1143,7 @@
196N/A .B \fBusername\fP
196N/A .sp
196N/A The committer of a changeset created when running "commit".
196N/A-Typically a person\(aqs name and email address, e.g. \fBFred Widget
196N/A+Typically a person's name and email address, e.g. \fBFred Widget
196N/A <fred@example.com>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If
196N/A the username in hgrc is empty, it has to be specified manually or
196N/A in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set
196N/A@@ -1266,7 +1157,7 @@
196N/A .SS \fBweb\fP
196N/A .sp
196N/A Web interface configuration. The settings in this section apply to
196N/A-both the builtin webserver (started by \%\fBhg serve\fP\:) and the script you
196N/A+both the builtin webserver (started by \fBhg serve\fP) and the script you
196N/A run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
196N/A and WSGI).
196N/A .sp
196N/A@@ -1282,9 +1173,9 @@
196N/A command line:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A $ hg \-\-config web.allow_push=* \-\-config web.push_ssl=False serve
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A Note that this will allow anybody to push anything to the server and
196N/A@@ -1363,7 +1254,7 @@
196N/A with these certificates. The form must be as follows:
196N/A .sp
196N/A .nf
196N/A-.ft C
196N/A+.ft
196N/A \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
196N/A \&... (certificate in base64 PEM encoding) ...
196N/A \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
196N/A@@ -1370,7 +1261,7 @@
196N/A \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
196N/A \&... (certificate in base64 PEM encoding) ...
196N/A \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
196N/A-.ft P
196N/A+.ft
196N/A .fi
196N/A .sp
196N/A This feature is only supported when using Python 2.6 or later. If you wish
196N/A@@ -1378,7 +1269,7 @@
196N/A version of the ssl library that is available from
196N/A \fBhttp://pypi.python.org\fP.
196N/A .sp
196N/A-You can use OpenSSL\(aqs CA certificate file if your platform has one.
196N/A+You can use OpenSSL's CA certificate file if your platform has one.
196N/A On most Linux systems this will be \fB/etc/ssl/certs/ca\-certificates.crt\fP.
196N/A Otherwise you will have to generate this file manually.
196N/A .sp
196N/A@@ -1422,7 +1313,7 @@
196N/A .TP
196N/A .B \fBdescription\fP
196N/A .sp
196N/A-Textual description of the repository\(aqs purpose or contents.
196N/A+Textual description of the repository's purpose or contents.
196N/A Default is "unknown".
196N/A .TP
196N/A .B \fBencoding\fP
196N/A@@ -1462,7 +1353,7 @@
196N/A .TP
196N/A .B \fBprefix\fP
196N/A .sp
196N/A-Prefix path to serve from. Default is \(aq\(aq (server root).
196N/A+Prefix path to serve from. Default is '' (server root).
196N/A .TP
196N/A .B \fBpush_ssl\fP
196N/A .sp
196N/A@@ -1491,15 +1382,15 @@
196N/A .UNINDENT
196N/A .SH AUTHOR
196N/A .sp
196N/A-Bryan O\(aqSullivan <\%bos@serpentine.com\:>.
196N/A+Bryan O'Sullivan <bos@serpentine.com>.
196N/A .sp
196N/A-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
196N/A+Mercurial was written by Matt Mackall <mpm@selenic.com>.
196N/A .SH SEE ALSO
196N/A .sp
196N/A-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\:
196N/A+\fBhg\fP(1), \fBhgignore\fP(5)
196N/A .SH COPYING
196N/A .sp
196N/A-This manual page is copyright 2005 Bryan O\(aqSullivan.
196N/A+This manual page is copyright 2005 Bryan O'Sullivan.
196N/A Mercurial is copyright 2005\-2010 Matt Mackall.
196N/A Free use of this software is granted under the terms of the GNU General
196N/A Public License version 2 or any later version.