components/mercurial/patches/manpages.patch
author Danek Duvall <danek.duvall@oracle.com>
Wed, 11 Jun 2014 10:40:29 -0700
changeset 1981 66b174f4707e
parent 1637 54bd5ac8db85
child 3596 042f4e7a6dbe
permissions -rw-r--r--
19144423 mercurial 3.0.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
     1
--- mercurial-3.0.1/doc/hg.1.orig	Sun Jun  1 14:15:47 2014
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
     2
+++ mercurial-3.0.1/doc/hg.1	Fri Jun  6 10:48:15 2014
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
     3
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     4
 .TH HG 1 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     5
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     6
 hg \- Mercurial source code management system
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     7
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     8
-.nr rst2man-indent-level 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
     9
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    10
-.de1 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    11
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    12
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    13
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    14
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    15
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    16
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    17
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    18
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    19
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    20
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    21
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    22
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    23
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    24
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    25
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    26
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    27
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    28
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    29
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    30
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    31
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    32
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    33
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    34
 .SH SYNOPSIS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    35
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    36
 \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    37
@@ -38,12 +11,12 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    38
 The \fBhg\fP command provides a command line interface to the Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    39
 system.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    40
 .SH COMMAND ELEMENTS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    41
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    42
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    43
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    44
 .B files...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    45
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    46
 indicates one or more filename or relative path filenames; see
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    47
-\%File Name Patterns\: for information on pattern matching
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    48
+File Name Patterns for information on pattern matching
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    49
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    50
 .B path
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    51
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    52
@@ -59,9 +32,9 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    53
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    54
 either the pathname of a local repository or the URI of a remote
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    55
 repository.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    56
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    57
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    58
 .SH OPTIONS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    59
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    60
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    61
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    62
 .BI \-R,  \-\-repository \ <REPO>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    63
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    64
@@ -85,7 +58,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    65
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    66
 .BI \-\-config \ <CONFIG[+]>
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    67
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    68
-set/override config option (use \(aqsection.name=value\(aq)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    69
+set/override config option (use 'section.name=value')
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    70
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    71
 .B \-\-debug
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    72
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    73
@@ -126,7 +99,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    74
 .B \-\-hidden
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    75
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    76
 consider hidden changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    77
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    78
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    79
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    80
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    81
 .SH COMMANDS
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    82
@@ -135,9 +108,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    83
 add the specified files on the next commit:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    84
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    85
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    86
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    87
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    88
 hg add [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    89
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    90
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    91
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    92
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    93
 Schedule files to be version controlled and added to the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    94
@@ -144,15 +117,15 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    95
 repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    96
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    97
 The files will be added to the repository at the next commit. To
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    98
-undo an add before that, see \%\fBhg forget\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    99
+undo an add before that, see \fBhg forget\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   100
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   101
 If no names are given, add all files to the repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   102
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   103
 An example showing how new (unknown) files are added
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   104
-automatically by \%\fBhg add\fP\::
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   105
+automatically by \fBhg add\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   106
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   107
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   108
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   109
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   110
 $ ls
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   111
 foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   112
 $ hg status
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   113
@@ -161,13 +134,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   114
 adding foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   115
 $ hg status
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   116
 A foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   117
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   118
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   119
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   120
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   121
 Returns 0 if all files are successfully added.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   122
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   123
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   124
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   125
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   126
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   127
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   128
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   129
@@ -184,7 +157,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   130
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   131
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   132
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   133
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   134
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   135
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   136
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   137
 .SS addremove
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   138
@@ -192,9 +165,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   139
 add all new files, delete all missing files:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   140
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   141
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   142
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   143
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   144
 hg addremove [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   145
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   146
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   147
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   148
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   149
 Add all new files and remove all missing files from the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   150
@@ -201,7 +174,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   151
 repository.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   152
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   153
 New files are ignored if they match any of the patterns in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   154
-\fB.hgignore\fP. As with add, these changes take effect at the next
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   155
+\fB\&.hgignore\fP. As with add, these changes take effect at the next
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   156
 commit.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   157
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   158
 Use the \-s/\-\-similarity option to detect renamed files. This
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   159
@@ -209,7 +182,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   160
 be identical) as its parameter. With a parameter greater than 0,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   161
 this compares every removed file with every added file and records
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   162
 those similar enough as renames. Detecting renamed files this way
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   163
-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   164
+can be expensive. After using this option, \fBhg status \-C\fP can be
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   165
 used to check which files were identified as moved or renamed. If
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   166
 not specified, \-s/\-\-similarity defaults to 100 and only renames of
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   167
 identical files are detected.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   168
@@ -217,7 +190,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   169
 Returns 0 if all files are successfully added.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   170
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   171
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   172
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   173
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   174
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   175
 .BI \-s,  \-\-similarity \ <SIMILARITY>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   176
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   177
@@ -234,7 +207,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   178
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   179
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   180
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   181
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   182
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   183
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   184
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   185
 .SS annotate
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   186
@@ -242,9 +215,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   187
 show changeset information by line for each file:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   188
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   189
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   190
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   191
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   192
 hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   193
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   194
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   195
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   196
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   197
 List changes in files, showing the revision id responsible for
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   198
@@ -261,7 +234,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   199
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   200
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   201
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   202
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   203
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   204
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   205
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   206
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   207
@@ -273,7 +246,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   208
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   209
 .B \-\-no\-follow
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   210
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   211
-don\(aqt follow copies and renames
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   212
+don't follow copies and renames
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   213
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   214
 .B \-a,  \-\-text
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   215
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   216
@@ -322,23 +295,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   217
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   218
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   219
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   220
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   221
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   222
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   223
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   224
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   225
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   226
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   227
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   228
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   229
 aliases: blame
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   230
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   231
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   232
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   233
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   234
 .SS archive
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   235
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   236
 create an unversioned archive of a repository revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   237
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   238
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   239
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   240
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   241
 hg archive [OPTION]... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   242
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   243
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   244
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   245
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   246
 By default, the revision used is the parent of the working
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   247
@@ -348,15 +321,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   248
 extension (or override using \-t/\-\-type).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   249
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   250
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   251
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   252
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   253
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   254
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   255
 create a zip file containing the 1.0 release:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   256
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   257
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   258
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   259
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   260
 hg archive \-r 1.0 project\-1.0.zip
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   261
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   262
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   263
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   264
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   265
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   266
@@ -363,14 +336,14 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   267
 create a tarball excluding .hg files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   268
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   269
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   270
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   271
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   272
 hg archive project.tar.gz \-X ".hg*"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   273
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   274
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   275
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   276
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   277
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   278
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   279
 Valid types are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   280
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   281
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   282
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   283
 .B \fBfiles\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   284
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   285
@@ -395,10 +368,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   286
 .B \fBzip\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   287
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   288
 zip archive, compressed using deflate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   289
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   290
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   291
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   292
 The exact name of the destination archive or directory is given
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   293
-using a format string; see \%\fBhg help export\fP\: for details.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   294
+using a format string; see \fBhg help export\fP for details.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   295
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   296
 Each member added to an archive file has a directory prefix
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   297
 prepended. Use \-p/\-\-prefix to specify a format string for the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   298
@@ -408,7 +381,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   299
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   300
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   301
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   302
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   303
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   304
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   305
 .B \-\-no\-decode
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   306
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   307
@@ -437,7 +410,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   308
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   309
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   310
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   311
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   312
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   313
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   314
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   315
 .SS backout
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   316
@@ -445,9 +418,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   317
 reverse effect of earlier changeset:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   318
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   319
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   320
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   321
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   322
 hg backout [OPTION]... [\-r] REV
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   323
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   324
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   325
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   326
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   327
 Prepare a new changeset with the effect of REV undone in the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   328
@@ -468,17 +441,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   329
 working directory and a new child of REV that simply undoes REV.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   330
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   331
 Before version 1.7, the behavior without \-\-merge was equivalent
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   332
-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   333
+to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   334
 cancel the merge and leave the child of REV as a head to be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   335
 merged separately.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   336
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   337
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   338
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   339
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   340
 Returns 0 on success, 1 if nothing to backout or there are unresolved
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   341
 files.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   342
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   343
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   344
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   345
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   346
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   347
 .B \-\-merge
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   348
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   349
@@ -519,7 +492,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   350
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   351
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   352
 record the specified user as committer
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   353
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   354
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   355
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   356
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   357
 .SS bisect
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   358
@@ -527,9 +500,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   359
 subdivision search of changesets:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   360
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   361
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   362
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   363
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   364
 hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   365
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   366
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   367
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   368
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   369
 This command helps to find changesets which introduce problems. To
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   370
@@ -553,16 +526,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   371
 is bad.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   372
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   373
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   374
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   375
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   376
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   377
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   378
 start a bisection with known bad revision 34, and good revision 12:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   379
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   380
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   381
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   382
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   383
 hg bisect \-\-bad 34
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   384
 hg bisect \-\-good 12
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   385
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   386
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   387
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   388
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   389
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   390
@@ -570,10 +543,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   391
 bad:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   392
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   393
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   394
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   395
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   396
 hg bisect \-\-good
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   397
 hg bisect \-\-bad
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   398
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   399
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   400
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   401
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   402
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   403
@@ -581,10 +554,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   404
 that revision is not usable because of another issue):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   405
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   406
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   407
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   408
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   409
 hg bisect \-\-skip
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   410
 hg bisect \-\-skip 23
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   411
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   412
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   413
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   414
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   415
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   416
@@ -591,9 +564,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   417
 skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   418
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   419
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   420
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   421
-hg bisect \-\-skip "!( file(\(aqpath:foo\(aq) & file(\(aqpath:bar\(aq) )"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   422
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   423
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   424
+hg bisect \-\-skip "!( file('path:foo') & file('path:bar') )"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   425
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   426
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   427
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   428
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   429
@@ -600,22 +573,22 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   430
 forget the current bisection:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   431
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   432
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   433
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   434
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   435
 hg bisect \-\-reset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   436
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   437
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   438
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   439
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   440
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   441
-use \(aqmake && make tests\(aq to automatically find the first broken
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   442
+use 'make && make tests' to automatically find the first broken
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   443
 revision:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   444
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   445
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   446
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   447
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   448
 hg bisect \-\-reset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   449
 hg bisect \-\-bad 34
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   450
 hg bisect \-\-good 12
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   451
 hg bisect \-\-command "make && make tests"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   452
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   453
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   454
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   455
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   456
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   457
@@ -623,9 +596,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   458
 bisection:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   459
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   460
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   461
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   462
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   463
 hg log \-r "bisect(pruned)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   464
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   465
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   466
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   467
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   468
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   469
@@ -633,9 +606,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   470
 if running with \-U/\-\-noupdate):
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   471
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   472
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   473
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   474
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   475
 hg log \-r "bisect(current)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   476
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   477
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   478
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   479
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   480
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   481
@@ -642,9 +615,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   482
 see all changesets that took part in the current bisection:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   483
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   484
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   485
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   486
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   487
 hg log \-r "bisect(range)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   488
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   489
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   490
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   491
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   492
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   493
@@ -651,18 +624,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   494
 you can even get a nice graph:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   495
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   496
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   497
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   498
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   499
 hg log \-\-graph \-r "bisect(range)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   500
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   501
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   502
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   503
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   504
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   505
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   506
-See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   507
+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   508
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   509
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   510
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   511
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   512
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   513
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   514
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   515
 .B \-r,  \-\-reset
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   516
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   517
@@ -691,33 +664,33 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   518
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   519
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   520
 do not update to target
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   521
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   522
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   523
 .SS bookmarks
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   524
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   525
 track a line of development with movable markers:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   526
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   527
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   528
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   529
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   530
 hg bookmarks [OPTIONS]... [NAME]...
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   531
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   532
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   533
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   534
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   535
 Bookmarks are pointers to certain commits that move when committing.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   536
 Bookmarks are local. They can be renamed, copied and deleted. It is
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   537
-possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   538
-\%\fBhg update NAME\fP\: to update to a given bookmark.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   539
+possible to use \fBhg merge NAME\fP to merge from a given bookmark, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   540
+\fBhg update NAME\fP to update to a given bookmark.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   541
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   542
-You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   543
-directory\(aqs parent revision with the given name. If you specify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   544
+You can use \fBhg bookmark NAME\fP to set a bookmark on the working
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   545
+directory's parent revision with the given name. If you specify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   546
 a revision using \-r REV (where REV may be an existing bookmark),
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   547
 the bookmark is assigned to that revision.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   548
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   549
-Bookmarks can be pushed and pulled between repositories (see \%\fBhg help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   550
-push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   551
+Bookmarks can be pushed and pulled between repositories (see \fBhg help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   552
+push\fP and \fBhg help pull\fP). This requires both the local and remote
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   553
 repositories to support bookmarks. For versions prior to 1.8, this means
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   554
 the bookmarks extension must be enabled.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   555
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   556
-If you set a bookmark called \(aq@\(aq, new clones of the repository will
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   557
+If you set a bookmark called '@', new clones of the repository will
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   558
 have that revision checked out (and the bookmark made active) by
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   559
 default.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   560
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   561
@@ -727,7 +700,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   562
 current active bookmark will be marked inactive.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   563
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   564
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   565
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   566
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   567
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   568
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   569
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   570
@@ -750,20 +723,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   571
 mark a bookmark inactive
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   572
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   573
 aliases: bookmark
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   574
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   575
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   576
 .SS branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   577
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   578
 set or show the current branch name:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   579
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   580
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   581
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   582
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   583
 hg branch [\-fC] [NAME]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   584
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   585
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   586
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   587
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   588
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   589
-Branch names are permanent and global. Use \%\fBhg bookmark\fP\: to create a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   590
-light\-weight bookmark instead. See \%\fBhg help glossary\fP\: for more
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   591
+Branch names are permanent and global. Use \fBhg bookmark\fP to create a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   592
+light\-weight bookmark instead. See \fBhg help glossary\fP for more
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   593
 information about named branches and bookmarks.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   594
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   595
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   596
@@ -770,23 +743,23 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   597
 With no argument, show the current branch name. With one argument,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   598
 set the working directory branch name (the branch will not exist
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   599
 in the repository until the next commit). Standard practice
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   600
-recommends that primary development take place on the \(aqdefault\(aq
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   601
+recommends that primary development take place on the 'default'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   602
 branch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   603
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   604
 Unless \-f/\-\-force is specified, branch will not let you set a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   605
-branch name that already exists, even if it\(aqs inactive.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   606
+branch name that already exists, even if it's inactive.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   607
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   608
 Use \-C/\-\-clean to reset the working directory branch to that of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   609
 the parent of the working directory, negating a previous branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   610
 change.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   611
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   612
-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   613
-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   614
+Use the command \fBhg update\fP to switch to an existing branch. Use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   615
+\fBhg commit \-\-close\-branch\fP to mark this branch as closed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   616
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   617
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   618
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   619
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   620
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   621
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   622
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   623
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   624
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   625
@@ -795,30 +768,30 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   626
 .B \-C,  \-\-clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   627
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   628
 reset branch name to parent branch name
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   629
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   630
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   631
 .SS branches
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   632
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   633
 list repository named branches:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   634
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   635
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   636
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   637
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   638
 hg branches [\-ac]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   639
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   640
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   641
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   642
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   643
-List the repository\(aqs named branches, indicating which ones are
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   644
+List the repository's named branches, indicating which ones are
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   645
 inactive. If \-c/\-\-closed is specified, also list branches which have
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   646
-been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   647
+been marked closed (see \fBhg commit \-\-close\-branch\fP).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   648
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   649
 If \-a/\-\-active is specified, only show active branches. A branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   650
 is considered active if it contains repository heads.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   651
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   652
-Use the command \%\fBhg update\fP\: to switch to an existing branch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   653
+Use the command \fBhg update\fP to switch to an existing branch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   654
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   655
 Returns 0.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   656
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   657
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   658
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   659
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   660
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   661
 .B \-a,  \-\-active
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   662
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   663
@@ -827,15 +800,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   664
 .B \-c,  \-\-closed
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   665
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   666
 show normal and closed branches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   667
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   668
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   669
 .SS bundle
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   670
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   671
 create a changegroup file:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   672
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   673
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   674
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   675
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   676
 hg bundle [\-f] [\-t TYPE] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   677
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   678
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   679
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   680
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   681
 Generate a compressed changegroup file collecting changesets not
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   682
@@ -861,7 +834,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   683
 Returns 0 on success, 1 if no changes found.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   684
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   685
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   686
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   687
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   688
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   689
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   690
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   691
@@ -898,7 +871,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   692
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   693
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   694
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   695
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   696
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   697
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   698
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   699
 .SS cat
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   700
@@ -906,9 +879,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   701
 output the current or given revision of files:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   702
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   703
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   704
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   705
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   706
 hg cat [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   707
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   708
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   709
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   710
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   711
 Print the specified files as they were at the given revision. If
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   712
@@ -916,7 +889,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   713
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   714
 Output may be to a file, in which case the name of the file is
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   715
 given using a format string. The formatting rules as follows:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   716
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   717
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   718
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   719
 .B \fB%%\fP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   720
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   721
@@ -928,7 +901,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   722
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   723
 .B \fB%d\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   724
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   725
-dirname of file being printed, or \(aq.\(aq if in repository root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   726
+dirname of file being printed, or '.' if in repository root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   727
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   728
 .B \fB%p\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   729
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   730
@@ -953,12 +926,12 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   731
 .B \fB%b\fP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   732
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   733
 basename of the exporting repository
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   734
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   735
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   736
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   737
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   738
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   739
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   740
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   741
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   742
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   743
 .BI \-o,  \-\-output \ <FORMAT>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   744
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   745
@@ -979,7 +952,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   746
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   747
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   748
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   749
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   750
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   751
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   752
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   753
 .SS clone
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   754
@@ -987,9 +960,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   755
 make a copy of an existing repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   756
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   757
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   758
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   759
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   760
 hg clone [OPTION]... SOURCE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   761
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   762
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   763
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   764
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   765
 Create a copy of an existing repository in a new directory.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   766
@@ -997,22 +970,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   767
 If no destination directory name is specified, it defaults to the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   768
 basename of the source.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   769
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   770
-The location of the source is added to the new repository\(aqs
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   771
-\fB.hg/hgrc\fP file, as the default to be used for future pulls.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   772
+The location of the source is added to the new repository's
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   773
+\fB\&.hg/hgrc\fP file, as the default to be used for future pulls.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   774
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   775
 Only local paths and \fBssh://\fP URLs are supported as
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   776
 destinations. For \fBssh://\fP destinations, no working directory or
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   777
-\fB.hg/hgrc\fP will be created on the remote side.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   778
+\fB\&.hg/hgrc\fP will be created on the remote side.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   779
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   780
 To pull only a subset of changesets, specify one or more revisions
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   781
 identifiers with \-r/\-\-rev or branches with \-b/\-\-branch. The
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   782
 resulting clone will contain only the specified changesets and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   783
-their ancestors. These options (or \(aqclone src#rev dest\(aq) imply
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   784
+their ancestors. These options (or 'clone src#rev dest') imply
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   785
 \-\-pull, even for local source repositories. Note that specifying a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   786
 tag will include the tagged changeset but not the changeset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   787
 containing the tag.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   788
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   789
-If the source repository has a bookmark called \(aq@\(aq set, that
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   790
+If the source repository has a bookmark called '@' set, that
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   791
 revision will be checked out in the new repository by default.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   792
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   793
 To check out a particular version, use \-u/\-\-update, or
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   794
@@ -1029,9 +1002,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   795
 directory using full hardlinks with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   796
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   797
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   798
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   799
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   800
 $ cp \-al REPO REPOCLONE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   801
-.ft P
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   802
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   803
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   804
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   805
 This is the fastest way to clone, but it is not always safe. The
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   806
@@ -1043,7 +1016,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   807
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   808
 Mercurial will update the working directory to the first applicable
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   809
 revision from this list:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   810
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   811
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   812
 .IP a. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   813
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   814
 null if \-U or the source repository has no changesets
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   815
@@ -1050,7 +1023,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   816
 .IP b. 3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   817
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   818
 if \-u . and the source repository is local, the first parent of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   819
-the source repository\(aqs working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   820
+the source repository's working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   821
 .IP c. 3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   822
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   823
 the changeset specified with \-u (if a branch name, this means the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   824
@@ -1066,7 +1039,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   825
 the tipmost head specified with the url#branch source syntax
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   826
 .IP g. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   827
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   828
-the revision marked with the \(aq@\(aq bookmark, if present
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   829
+the revision marked with the '@' bookmark, if present
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   830
 .IP h. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   831
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   832
 the tipmost head of the default branch
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   833
@@ -1073,18 +1046,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   834
 .IP i. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   835
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   836
 tip
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   837
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   838
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   839
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   840
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   841
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   842
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   843
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   844
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   845
 clone a remote repository to a new directory named hg/:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   846
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   847
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   848
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   849
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   850
 hg clone http://selenic.com/hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   851
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   852
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   853
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   854
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   855
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   856
@@ -1091,9 +1064,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   857
 create a lightweight local clone:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   858
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   859
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   860
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   861
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   862
 hg clone project/ project\-feature/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   863
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   864
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   865
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   866
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   867
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   868
@@ -1100,9 +1073,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   869
 clone from an absolute path on an ssh server (note double\-slash):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   870
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   871
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   872
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   873
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   874
 hg clone ssh://user@server//home/projects/alpha/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   875
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   876
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   877
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   878
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   879
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   880
@@ -1110,9 +1083,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   881
 specified version:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   882
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   883
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   884
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   885
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   886
 hg clone \-\-uncompressed http://server/repo \-u 1.5
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   887
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   888
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   889
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   890
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   891
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   892
@@ -1119,9 +1092,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   893
 create a repository without changesets after a particular revision:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   894
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   895
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   896
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   897
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   898
 hg clone \-r 04e544 experimental/ good/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   899
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   900
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   901
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   902
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   903
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   904
@@ -1128,18 +1101,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   905
 clone (and track) a particular named branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   906
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   907
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   908
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   909
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   910
 hg clone http://selenic.com/hg#stable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   911
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   912
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   913
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   914
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   915
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   916
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   917
-See \%\fBhg help urls\fP\: for details on specifying URLs.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   918
+See \fBhg help urls\fP for details on specifying URLs.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   919
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   920
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   921
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   922
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   923
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   924
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   925
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   926
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   927
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   928
@@ -1176,7 +1149,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   929
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   930
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   931
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   932
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   933
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   934
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   935
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   936
 .SS commit
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   937
@@ -1184,16 +1157,16 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   938
 commit the specified files or all outstanding changes:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   939
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   940
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   941
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   942
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   943
 hg commit [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   944
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   945
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   946
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   947
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   948
 Commit changes to the given files into the repository. Unlike a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   949
 centralized SCM, this operation is a local operation. See
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   950
-\%\fBhg push\fP\: for a way to actively distribute your changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   951
+\fBhg push\fP for a way to actively distribute your changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   952
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   953
-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   954
+If a list of files is omitted, all changes reported by \fBhg status\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   955
 will be committed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   956
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   957
 If you are committing the result of a merge, do not provide any
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   958
@@ -1202,28 +1175,28 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   959
 If no commit message is specified, Mercurial starts your
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   960
 configured editor where you can enter a message. In case your
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   961
 commit fails, you will find a backup of your message in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   962
-\fB.hg/last\-message.txt\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   963
+\fB\&.hg/last\-message.txt\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   964
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   965
 The \-\-amend flag can be used to amend the parent of the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   966
 working directory with a new commit that contains the changes
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   967
-in the parent in addition to those currently reported by \%\fBhg status\fP\:,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   968
+in the parent in addition to those currently reported by \fBhg status\fP,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   969
 if there are any. The old commit is stored in a backup bundle in
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   970
-\fB.hg/strip\-backup\fP (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   971
+\fB\&.hg/strip\-backup\fP (see \fBhg help bundle\fP and \fBhg help unbundle\fP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   972
 on how to restore it).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   973
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   974
 Message, user and date are taken from the amended commit unless
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   975
-specified. When a message isn\(aqt specified on the command line,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   976
+specified. When a message isn't specified on the command line,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   977
 the editor will open with the message of the amended commit.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   978
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   979
-It is not possible to amend public changesets (see \%\fBhg help phases\fP\:)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   980
+It is not possible to amend public changesets (see \fBhg help phases\fP)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   981
 or changesets that have children.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   982
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   983
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   984
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   985
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   986
 Returns 0 on success, 1 if nothing changed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   987
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   988
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   989
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   990
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   991
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   992
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   993
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   994
@@ -1272,23 +1245,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   995
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   996
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   997
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   998
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   999
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1000
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1001
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1002
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1003
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1004
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1005
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1006
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1007
 aliases: ci
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1008
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1009
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1010
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1011
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1012
 .SS config
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1013
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1014
 show combined config settings from all hgrc files:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1015
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1016
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1017
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1018
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1019
 hg config [\-u] [NAME]...
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1020
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1021
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1022
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1023
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1024
 With no arguments, print names and values of all config items.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1025
@@ -1306,12 +1279,12 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1026
 With \-\-debug, the source (filename and line number) is printed
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1027
 for each config item.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1028
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1029
-See \%\fBhg help config\fP\: for more information about config files.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1030
+See \fBhg help config\fP for more information about config files.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1031
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1032
 Returns 0 on success.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1033
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1034
 Options:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1035
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1036
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1037
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1038
 .B \-u,  \-\-untrusted
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1039
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1040
@@ -1330,15 +1303,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1041
 edit global config
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1042
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1043
 aliases: showconfig debugconfig
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1044
-.UNINDENT
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1045
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1046
 .SS copy
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1047
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1048
 mark files as copied for the next commit:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1049
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1050
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1051
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1052
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1053
 hg copy [OPTION]... [SOURCE]... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1054
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1055
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1056
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1057
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1058
 Mark dest as having copies of source files. If dest is a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1059
@@ -1350,12 +1323,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1060
 operation is recorded, but no copying is performed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1061
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1062
 This command takes effect with the next commit. To undo a copy
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1063
-before that, see \%\fBhg revert\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1064
+before that, see \fBhg revert\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1065
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1066
 Returns 0 on success, 1 if errors are encountered.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1067
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1068
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1069
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1070
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1071
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1072
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1073
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1074
@@ -1376,23 +1349,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1075
 .B \-n,  \-\-dry\-run
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1076
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1077
 do not perform actions, just print output
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1078
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1079
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1080
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1081
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1082
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1083
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1084
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1085
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1086
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1087
 aliases: cp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1088
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1089
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1090
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1091
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1092
 .SS diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1093
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1094
 diff repository (or selected files):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1095
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1096
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1097
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1098
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1099
 hg diff [OPTION]... ([\-c REV] | [\-r REV1 [\-r REV2]]) [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1100
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1101
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1102
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1103
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1104
 Show differences between revisions for the specified files.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1105
@@ -1401,7 +1374,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1106
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1107
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1108
 diff may generate unexpected results for merges, as it will
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1109
-default to comparing against the working directory\(aqs first
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1110
+default to comparing against the working directory's first
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1111
 parent changeset if no revisions are specified.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  1112
 .RE
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  1113
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1114
@@ -1419,18 +1392,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1115
 anyway, probably with undesirable results.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1116
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1117
 Use the \-g/\-\-git option to generate diffs in the git extended diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1118
-format. For more information, read \%\fBhg help diffs\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1119
+format. For more information, read \fBhg help diffs\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1120
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1121
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1122
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1123
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1124
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1125
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1126
 compare a file in the current working directory to its parent:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1127
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1128
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1129
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1130
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1131
 hg diff foo.c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1132
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1133
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1134
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1135
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1136
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1137
@@ -1437,9 +1410,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1138
 compare two historical versions of a directory, with rename info:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1139
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1140
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1141
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1142
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1143
 hg diff \-\-git \-r 1.0:1.2 lib/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1144
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1145
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1146
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1147
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1148
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1149
@@ -1446,9 +1419,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1150
 get change stats relative to the last change on some date:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1151
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1152
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1153
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1154
-hg diff \-\-stat \-r "date(\(aqmay 2\(aq)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1155
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1156
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1157
+hg diff \-\-stat \-r "date('may 2')"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1158
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1159
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1160
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1161
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1162
@@ -1455,9 +1428,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1163
 diff all newly\-added files that contain a keyword:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1164
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1165
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1166
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1167
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1168
 hg diff "set:added() and grep(GNU)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1169
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1170
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1171
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1172
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1173
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1174
@@ -1464,18 +1437,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1175
 compare a revision and its parents:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1176
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1177
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1178
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1179
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1180
 hg diff \-c 9353         # compare against first parent
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1181
 hg diff \-r 9353^:9353   # same using revset syntax
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1182
 hg diff \-r 9353^2:9353  # compare against the second parent
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1183
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1184
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1185
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1186
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1187
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1188
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1189
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1190
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1191
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1192
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1193
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1194
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1195
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1196
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1197
@@ -1536,7 +1509,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1198
 .B \-S,  \-\-subrepos
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1199
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1200
 recurse into subrepositories
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1201
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1202
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1203
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1204
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1205
 .SS export
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1206
@@ -1544,9 +1517,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1207
 dump the header and diffs for one or more changesets:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1208
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1209
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1210
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1211
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1212
 hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1213
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1214
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1215
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1216
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1217
 Print the changeset header and diffs for one or more revisions.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1218
@@ -1564,7 +1537,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1219
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1220
 Output may be to a file, in which case the name of the file is
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1221
 given using a format string. The formatting rules are as follows:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1222
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1223
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1224
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1225
 .B \fB%%\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1226
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1227
@@ -1601,7 +1574,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1228
 .B \fB%r\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1229
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1230
 zero\-padded changeset revision number
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1231
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1232
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1233
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1234
 Without the \-a/\-\-text option, export will avoid generating diffs
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1235
 of files it detects as binary. With \-a, export will generate a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1236
@@ -1608,13 +1581,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1237
 diff anyway, probably with undesirable results.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1238
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1239
 Use the \-g/\-\-git option to generate diffs in the git extended diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1240
-format. See \%\fBhg help diffs\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1241
+format. See \fBhg help diffs\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1242
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1243
 With the \-\-switch\-parent option, the diff will be against the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1244
 second parent. It can be useful to review a merge.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1245
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1246
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1247
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1248
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1249
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1250
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1251
 use export and import to transplant a bugfix to the current
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1252
@@ -1621,9 +1594,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1253
 branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1254
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1255
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1256
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1257
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1258
 hg export \-r 9353 | hg import \-
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1259
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1260
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1261
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1262
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1263
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1264
@@ -1631,9 +1604,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1265
 rename information:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1266
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1267
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1268
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1269
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1270
 hg export \-\-git \-r 123:150 > changes.txt
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1271
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1272
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1273
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1274
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1275
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1276
@@ -1641,16 +1614,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1277
 descriptive names:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1278
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1279
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1280
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1281
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1282
 hg export \-r "outgoing()" \-o "%n\-%m.patch"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1283
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1284
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1285
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1286
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1287
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1288
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1289
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1290
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1291
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1292
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1293
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1294
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1295
 .BI \-o,  \-\-output \ <FORMAT>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1296
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1297
@@ -1675,7 +1648,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1298
 .B \-\-nodates
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1299
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1300
 omit dates from diff headers
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1301
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1302
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1303
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1304
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1305
 .SS forget
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1306
@@ -1683,9 +1656,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1307
 forget the specified files on the next commit:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1308
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1309
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1310
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1311
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1312
 hg forget [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1313
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1314
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1315
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1316
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1317
 Mark the specified files so they will no longer be tracked
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1318
@@ -1695,18 +1668,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1319
 entire project history, and it does not delete them from the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1320
 working directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1321
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1322
-To undo a forget before the next commit, see \%\fBhg add\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1323
+To undo a forget before the next commit, see \fBhg add\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1324
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1325
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1326
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1327
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1328
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1329
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1330
 forget newly\-added binary files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1331
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1332
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1333
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1334
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1335
 hg forget "set:added() and binary()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1336
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1337
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1338
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1339
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1340
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1341
@@ -1713,16 +1686,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1342
 forget files that would be excluded by .hgignore:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1343
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1344
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1345
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1346
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1347
 hg forget "set:hgignore()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1348
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1349
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1350
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1351
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1352
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1353
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1354
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1355
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1356
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1357
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1358
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1359
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1360
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1361
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1362
@@ -1731,7 +1704,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1363
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1364
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1365
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1366
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1367
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1368
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1369
 [+] marked option can be specified multiple times
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1370
 .SS graft
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1371
@@ -1739,15 +1712,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1372
 copy changes from other branches onto the current branch:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1373
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1374
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1375
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1376
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1377
 hg graft [OPTION]... [\-r] REV...
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1378
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1379
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1380
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1381
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1382
-This command uses Mercurial\(aqs merge logic to copy individual
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1383
+This command uses Mercurial's merge logic to copy individual
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1384
 changes from other branches without merging branches in the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1385
-history graph. This is sometimes known as \(aqbackporting\(aq or
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1386
-\(aqcherry\-picking\(aq. By default, graft will copy user, date, and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1387
+history graph. This is sometimes known as 'backporting' or
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1388
+\&'cherry\-picking'. By default, graft will copy user, date, and
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1389
 description from the source changesets.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1390
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1391
 Changesets that are ancestors of the current revision, that have
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1392
@@ -1757,9 +1730,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1393
 of the form:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1394
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1395
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1396
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1397
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1398
 (grafted from CHANGESETHASH)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1399
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1400
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1401
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1402
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1403
 If a graft merge results in conflicts, the graft process is
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1404
@@ -1772,16 +1745,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1405
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1406
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1407
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1408
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1409
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1410
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1411
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1412
 copy a single change to the stable branch and edit its description:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1413
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1414
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1415
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1416
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1417
 hg update stable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1418
 hg graft \-\-edit 9393
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1419
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1420
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1421
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1422
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1423
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1424
@@ -1788,9 +1761,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1425
 graft a range of changesets with one exception, updating dates:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1426
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1427
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1428
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1429
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1430
 hg graft \-D "2085::2093 and not 2091"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1431
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1432
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1433
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1434
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1435
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1436
@@ -1797,9 +1770,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1437
 continue a graft after resolving conflicts:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1438
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1439
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1440
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1441
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1442
 hg graft \-c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1443
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1444
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1445
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1446
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1447
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1448
@@ -1806,16 +1779,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1449
 show the source of a grafted changeset:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1450
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1451
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1452
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1453
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1454
 hg log \-\-debug \-r .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1455
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1456
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1457
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1458
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1459
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1460
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1461
 Returns 0 on successful completion.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1462
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1463
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1464
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1465
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1466
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1467
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1468
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1469
@@ -1856,7 +1829,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1470
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1471
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1472
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1473
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1474
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1475
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1476
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1477
 .SS grep
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1478
@@ -1864,9 +1837,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1479
 search for a pattern in specified files and revisions:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1480
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1481
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1482
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1483
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1484
 hg grep [OPTION]... PATTERN [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1485
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1486
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1487
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1488
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1489
 Search revisions of files for a regular expression.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1490
@@ -1885,7 +1858,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1491
 Returns 0 if a match is found, 1 otherwise.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1492
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1493
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1494
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1495
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1496
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1497
 .B \-0,  \-\-print0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1498
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1499
@@ -1934,7 +1907,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1500
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1501
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1502
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1503
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1504
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1505
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1506
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1507
 .SS heads
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1508
@@ -1942,9 +1915,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1509
 show branch heads:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1510
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1511
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1512
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1513
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1514
 hg heads [\-ct] [\-r STARTREV] [REV]...
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1515
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1516
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1517
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1518
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1519
 With no arguments, show all open branch heads in the repository.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1520
@@ -1954,11 +1927,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1521
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1522
 If one or more REVs are given, only open branch heads on the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1523
 branches associated with the specified changesets are shown. This
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1524
-means that you can use \%\fBhg heads .\fP\: to see the heads on the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1525
+means that you can use \fBhg heads .\fP to see the heads on the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1526
 currently checked\-out branch.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1527
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1528
 If \-c/\-\-closed is specified, also show branch heads marked closed
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1529
-(see \%\fBhg commit \-\-close\-branch\fP\:).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1530
+(see \fBhg commit \-\-close\-branch\fP).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1531
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1532
 If STARTREV is specified, only those heads that are descendants of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1533
 STARTREV will be displayed.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1534
@@ -1969,7 +1942,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1535
 Returns 0 if matching heads are found, 1 if not.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1536
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1537
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1538
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1539
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1540
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1541
 .BI \-r,  \-\-rev \ <STARTREV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1542
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1543
@@ -1994,15 +1967,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1544
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1545
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1546
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1547
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1548
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1549
 .SS help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1550
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1551
 show help for a given topic or a help overview:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1552
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1553
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1554
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1555
+.ft
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1556
 hg help [\-ec] [TOPIC]
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1557
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1558
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1559
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1560
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1561
 With no arguments, print a list of commands with short help messages.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1562
@@ -2013,7 +1986,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1563
 Returns 0 if successful.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1564
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1565
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1566
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1567
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1568
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1569
 .B \-e,  \-\-extension
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1570
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1571
@@ -2026,15 +1999,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1572
 .BI \-k,  \-\-keyword \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1573
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1574
 show topics matching keyword
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1575
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1576
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1577
 .SS identify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1578
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1579
 identify the working copy or specified revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1580
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1581
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1582
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1583
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1584
 hg identify [\-nibtB] [\-r REV] [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1585
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1586
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1587
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1588
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1589
 Print a summary identifying the repository state at REV using one or
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1590
@@ -2049,15 +2022,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1591
 cause lookup to operate on that repository/bundle.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1592
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1593
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1594
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1595
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1596
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1597
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1598
 generate a build identifier for the working directory:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1599
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1600
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1601
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1602
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1603
 hg id \-\-id > build\-id.dat
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1604
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1605
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1606
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1607
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1608
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1609
@@ -2064,9 +2037,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1610
 find the revision corresponding to a tag:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1611
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1612
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1613
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1614
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1615
 hg id \-n \-r 1.3
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1616
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1617
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1618
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1619
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1620
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1621
@@ -2073,16 +2046,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1622
 check the most recent revision of a remote repository:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1623
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1624
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1625
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1626
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1627
 hg id \-r tip http://selenic.com/hg/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1628
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1629
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1630
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1631
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1632
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1633
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1634
 Returns 0 if successful.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1635
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1636
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1637
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1638
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1639
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1640
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1641
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1642
@@ -2121,15 +2094,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1643
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1644
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1645
 aliases: id
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1646
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1647
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1648
 .SS import
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1649
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1650
 import an ordered set of patches:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1651
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1652
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1653
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1654
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1655
 hg import [OPTION]... PATCH...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1656
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1657
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1658
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1659
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1660
 Import a list of patches and commit them individually (unless
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1661
@@ -2145,7 +2118,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1662
 text/plain body parts before first diff are added to commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1663
 message.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1664
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1665
-If the imported patch was generated by \%\fBhg export\fP\:, user and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1666
+If the imported patch was generated by \fBhg export\fP, user and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1667
 description from patch override values from message headers and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1668
 body. Values given on command line with \-m/\-\-message and \-u/\-\-user
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1669
 override these.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1670
@@ -2162,22 +2135,22 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1671
 revision.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1672
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1673
 With \-s/\-\-similarity, hg will attempt to discover renames and
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1674
-copies in the patch in the same way as \%\fBhg addremove\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1675
+copies in the patch in the same way as \fBhg addremove\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1676
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1677
 To read a patch from standard input, use "\-" as the patch name. If
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1678
 a URL is specified, the patch will be downloaded from it.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1679
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1680
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1681
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1682
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1683
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1684
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1685
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1686
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1687
 import a traditional patch from a website and detect renames:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1688
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1689
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1690
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1691
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1692
 hg import \-s 80 http://example.com/bugfix.patch
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1693
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1694
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1695
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1696
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1697
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1698
@@ -2184,9 +2157,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1699
 import a changeset from an hgweb server:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1700
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1701
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1702
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1703
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1704
 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1705
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1706
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1707
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1708
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1709
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1710
@@ -2193,9 +2166,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1711
 import all the patches in an Unix\-style mbox:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1712
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1713
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1714
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1715
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1716
 hg import incoming\-patches.mbox
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1717
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1718
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1719
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1720
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1721
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1722
@@ -2203,16 +2176,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1723
 possible):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1724
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1725
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1726
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1727
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1728
 hg import \-\-exact proposed\-fix.patch
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1729
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1730
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1731
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1732
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1733
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1734
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1735
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1736
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1737
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1738
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1739
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1740
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1741
 .BI \-p,  \-\-strip \ <NUM>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1742
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1743
@@ -2232,7 +2205,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1744
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1745
 .B \-\-no\-commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1746
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1747
-don\(aqt commit, just update the working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1748
+don't commit, just update the working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1749
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1750
 .B \-\-bypass
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1751
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1752
@@ -2267,15 +2240,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1753
 guess renamed files by similarity (0<=s<=100)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1754
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1755
 aliases: patch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1756
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1757
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1758
 .SS incoming
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1759
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1760
 show new changesets found in source:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1761
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1762
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1763
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1764
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1765
 hg incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1766
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1767
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1768
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1769
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1770
 Show new changesets found in the specified path/URL or the default
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1771
@@ -2288,15 +2261,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1772
 See pull for valid source format details.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1773
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1774
 Examples:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1775
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1776
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1777
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1778
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1779
 show incoming changes with patches and full description:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1780
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1781
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1782
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1783
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1784
 hg incoming \-vp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1785
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1786
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1787
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1788
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1789
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1790
@@ -2303,10 +2276,10 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1791
 show incoming changes excluding merges, store a bundle:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1792
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1793
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1794
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1795
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1796
 hg in \-vpM \-\-bundle incoming.hg
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1797
 hg pull incoming.hg
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1798
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1799
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1800
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1801
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1802
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1803
@@ -2313,16 +2286,16 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1804
 briefly list changes inside a bundle:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1805
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1806
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1807
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1808
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1809
 hg in changes.hg \-T "{desc|firstline}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1810
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1811
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1812
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1813
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1814
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1815
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1816
 Returns 0 if there are incoming changes, 1 otherwise.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1817
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1818
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1819
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1820
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1821
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1822
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1823
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1824
@@ -2395,23 +2368,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1825
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1826
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1827
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1828
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1829
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1830
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1831
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1832
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1833
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1834
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1835
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1836
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1837
 aliases: in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1838
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1839
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1840
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1841
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1842
 .SS init
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1843
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1844
 create a new repository in the given directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1845
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1846
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1847
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1848
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1849
 hg init [\-e CMD] [\-\-remotecmd CMD] [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1850
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1851
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1852
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1853
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1854
 Initialize a new repository in the given directory. If the given
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1855
@@ -2420,12 +2393,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1856
 If no directory is given, the current directory is used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1857
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1858
 It is possible to specify an \fBssh://\fP URL as the destination.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1859
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1860
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1861
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1862
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1863
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1864
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1865
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1866
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1867
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1868
 .BI \-e,  \-\-ssh \ <CMD>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1869
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1870
@@ -2438,15 +2411,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1871
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1872
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1873
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1874
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1875
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1876
 .SS locate
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1877
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1878
 locate files matching specific patterns:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1879
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1880
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1881
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1882
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1883
 hg locate [OPTION]... [PATTERN]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1884
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1885
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1886
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1887
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1888
 Print files under Mercurial control in the working directory whose
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1889
@@ -2467,7 +2440,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1890
 Returns 0 if a match is found, 1 otherwise.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1891
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1892
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1893
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1894
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1895
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1896
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1897
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1898
@@ -2488,7 +2461,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1899
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1900
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1901
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1902
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1903
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1904
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1905
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1906
 .SS log
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1907
@@ -2496,9 +2469,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1908
 show revision history of entire repository or files:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1909
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1910
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1911
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1912
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1913
 hg log [OPTION]... [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1914
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1915
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1916
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1917
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1918
 Print the revision history of the specified files or the entire
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1919
@@ -2520,9 +2493,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1920
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1921
 With \-\-graph the revisions are shown as an ASCII art DAG with the most
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1922
 recent changeset at the top.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1923
-\(aqo\(aq is a changeset, \(aq@\(aq is a working directory parent, \(aqx\(aq is obsolete,
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1924
-and \(aq+\(aq represents a fork where the changeset from the lines below is a
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1925
-parent of the \(aqo\(aq merge on the same line.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1926
+\&'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1927
+and '+' represents a fork where the changeset from the lines below is a
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1928
+parent of the 'o' merge on the same line.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1929
 .IP Note
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1930
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1931
 log \-p/\-\-patch may generate unexpected diff output for merge
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1932
@@ -2539,15 +2512,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1933
 .RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1934
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1935
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1936
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1937
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1938
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1939
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1940
 changesets with full descriptions and file lists:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1941
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1942
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1943
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1944
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1945
 hg log \-v
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1946
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1947
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1948
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1949
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1950
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1951
@@ -2554,9 +2527,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1952
 changesets ancestral to the working directory:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1953
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1954
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1955
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1956
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1957
 hg log \-f
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1958
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1959
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1960
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1961
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1962
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1963
@@ -2563,9 +2536,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1964
 last 10 commits on the current branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1965
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1966
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1967
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1968
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1969
 hg log \-l 10 \-b .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1970
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1971
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1972
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1973
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1974
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1975
@@ -2572,9 +2545,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1976
 changesets showing all modifications of a file, including removals:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1977
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1978
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1979
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1980
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1981
 hg log \-\-removed file.c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1982
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1983
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1984
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1985
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1986
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1987
@@ -2581,9 +2554,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1988
 all changesets that touch a directory, with diffs, excluding merges:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1989
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1990
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1991
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1992
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1993
 hg log \-Mp lib/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1994
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1995
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1996
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1997
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1998
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1999
@@ -2590,9 +2563,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2000
 all revision numbers that match a keyword:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2001
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2002
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2003
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2004
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2005
 hg log \-k bug \-\-template "{rev}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2006
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2007
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2008
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2009
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2010
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2011
@@ -2599,9 +2572,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2012
 check if a given changeset is included is a tagged release:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2013
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2014
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2015
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2016
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2017
 hg log \-r "a21ccf and ancestor(1.9)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2018
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2019
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2020
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2021
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2022
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2023
@@ -2608,9 +2581,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2024
 find all changesets by some user in a date range:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2025
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2026
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2027
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2028
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2029
 hg log \-k alice \-d "may 2008 to jul 2008"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2030
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2031
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2032
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2033
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2034
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2035
@@ -2617,24 +2590,24 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2036
 summary of all changesets after the last tag:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2037
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2038
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2039
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2040
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2041
 hg log \-r "last(tagged())::" \-\-template "{desc|firstline}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2042
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2043
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2044
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2045
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2046
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2047
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2048
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2049
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2050
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2051
-See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2052
+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2053
 specifying revisions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2054
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2055
-See \%\fBhg help templates\fP\: for more about pre\-packaged styles and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2056
+See \fBhg help templates\fP for more about pre\-packaged styles and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2057
 specifying custom templates.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2058
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2059
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2060
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2061
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2062
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2063
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2064
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2065
 .B \-f,  \-\-follow
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2066
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2067
@@ -2723,23 +2696,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2068
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2069
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2070
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2071
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2072
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2073
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2074
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2075
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2076
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2077
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2078
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2079
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2080
 aliases: history
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2081
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2082
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2083
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2084
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2085
 .SS manifest
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2086
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2087
 output the current or given revision of the project manifest:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2088
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2089
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2090
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2091
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2092
 hg manifest [\-r REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2093
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2094
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2095
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2096
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2097
 Print a list of version controlled files for the given revision.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2098
@@ -2755,7 +2728,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2099
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2100
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2101
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2102
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2103
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2104
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2105
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2106
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2107
@@ -2764,15 +2737,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2108
 .B \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2109
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2110
 list files from all revisions
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2111
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2112
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2113
 .SS merge
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2114
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2115
 merge working directory with another revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2116
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2117
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2118
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2119
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2120
 hg merge [\-P] [\-f] [[\-r] REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2121
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2122
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2123
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2124
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2125
 The current working directory is updated with all changes made in
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2126
@@ -2785,16 +2758,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2127
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2128
 \fB\-\-tool\fP can be used to specify the merge tool used for file
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2129
 merges. It overrides the HGMERGE environment variable and your
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2130
-configuration files. See \%\fBhg help merge\-tools\fP\: for options.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2131
+configuration files. See \fBhg help merge\-tools\fP for options.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2132
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2133
-If no revision is specified, the working directory\(aqs parent is a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2134
+If no revision is specified, the working directory's parent is a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2135
 head revision, and the current branch contains exactly one other
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2136
 head, the other head is merged with by default. Otherwise, an
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2137
 explicit revision with which to merge with must be provided.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2138
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2139
-\%\fBhg resolve\fP\: must be used to resolve unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2140
+\fBhg resolve\fP must be used to resolve unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2141
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2142
-To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2143
+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2144
 will check out a clean copy of the original merge parent, losing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2145
 all changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2146
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2147
@@ -2801,7 +2774,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2148
 Returns 0 on success, 1 if there are unresolved files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2149
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2150
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2151
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2152
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2153
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2154
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2155
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2156
@@ -2818,15 +2791,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2157
 .BI \-t,  \-\-tool \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2158
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2159
 specify merge tool
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2160
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2161
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2162
 .SS outgoing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2163
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2164
 show changesets not found in the destination:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2165
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2166
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2167
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2168
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2169
 hg outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2170
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2171
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2172
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2173
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2174
 Show changesets not found in the specified destination repository
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2175
@@ -2838,7 +2811,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2176
 Returns 0 if there are outgoing changes, 1 otherwise.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2177
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2178
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2179
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2180
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2181
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2182
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2183
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2184
@@ -2907,26 +2880,26 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2185
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2186
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2187
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2188
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2189
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2190
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2191
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2192
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2193
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2194
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2195
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2196
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2197
 aliases: out
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2198
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2199
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2200
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2201
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2202
 .SS parents
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2203
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2204
 show the parents of the working directory or revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2205
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2206
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2207
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2208
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2209
 hg parents [\-r REV] [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2210
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2211
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2212
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2213
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2214
-Print the working directory\(aqs parent revisions. If a revision is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2215
+Print the working directory's parent revisions. If a revision is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2216
 given via \-r/\-\-rev, the parent of that revision will be printed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2217
 If a file argument is given, the revision in which the file was
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2218
 last changed (before the working directory revision or the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2219
@@ -2935,7 +2908,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2220
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2221
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2222
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2223
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2224
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2225
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2226
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2227
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2228
@@ -2948,15 +2921,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2229
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2230
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2231
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2232
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2233
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2234
 .SS paths
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2235
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2236
 show aliases for remote repositories:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2237
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2238
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2239
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2240
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2241
 hg paths [NAME]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2242
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2243
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2244
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2245
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2246
 Show definition of symbolic path name NAME. If no name is given,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2247
@@ -2977,10 +2950,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2248
 as the fallback for both.  When cloning a repository, the clone
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2249
 source is written as \fBdefault\fP in \fB.hg/hgrc\fP.  Note that
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2250
 \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2251
-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2252
-\%\fBhg bundle\fP\:) operations.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2253
+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2254
+\fBhg bundle\fP) operations.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2255
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2256
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2257
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2258
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2259
 Returns 0 on success.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2260
 .SS phase
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2261
@@ -2988,9 +2961,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2262
 set or show the current phase name:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2263
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2264
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2265
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2266
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2267
 hg phase [\-p|\-d|\-s] [\-f] [\-r] REV...
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2268
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2269
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2270
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2271
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2272
 With no argument, show the phase name of specified revisions.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2273
@@ -2998,13 +2971,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2274
 With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2275
 phase value of the specified revisions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2276
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2277
-Unless \-f/\-\-force is specified, \%\fBhg phase\fP\: won\(aqt move changeset from a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2278
+Unless \-f/\-\-force is specified, \fBhg phase\fP won't move changeset from a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2279
 lower phase to an higher phase. Phases are ordered as follows:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2280
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2281
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2282
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2283
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2284
 public < draft < secret
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2285
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2286
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2287
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2288
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2289
 Returns 0 on success, 1 if no phases were changed or some could not
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2290
@@ -3011,7 +2984,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2291
 be changed.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2292
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2293
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2294
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2295
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2296
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2297
 .B \-p,  \-\-public
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2298
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2299
@@ -3032,7 +3005,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2300
 .BI \-r,  \-\-rev \ <REV[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2301
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2302
 target revision
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2303
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2304
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2305
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2306
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2307
 .SS pull
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2308
@@ -3040,9 +3013,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2309
 pull changes from the specified source:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2310
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2311
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2312
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2313
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2314
 hg pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2315
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2316
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2317
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2318
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2319
 Pull changes from a remote repository to a local one.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2320
@@ -3052,18 +3025,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2321
 \-R is specified). By default, this does not update the copy of the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2322
 project in the working directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2323
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2324
-Use \%\fBhg incoming\fP\: if you want to see what would have been added
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2325
+Use \fBhg incoming\fP if you want to see what would have been added
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2326
 by a pull at the time you issued this command. If you then decide
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2327
-to add those changes to the repository, you should use \%\fBhg pull
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2328
-\-r X\fP\: where \fBX\fP is the last changeset listed by \%\fBhg incoming\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2329
+to add those changes to the repository, you should use \fBhg pull
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2330
+\-r X\fP where \fBX\fP is the last changeset listed by \fBhg incoming\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2331
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2332
-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2333
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2334
+If SOURCE is omitted, the 'default' path will be used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2335
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2336
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2337
 Returns 0 on success, 1 if an update had unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2338
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2339
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2340
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2341
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2342
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2343
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2344
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2345
@@ -3096,7 +3069,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2346
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2347
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2348
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2349
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2350
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2351
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2352
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2353
 .SS push
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2354
@@ -3104,9 +3077,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2355
 push changes to the specified destination:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2356
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2357
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2358
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2359
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2360
 hg push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2361
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2362
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2363
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2364
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2365
 Push changesets from the local repository to the specified
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2366
@@ -3137,13 +3110,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2367
 ancestors, and the bookmark will be pushed to the remote
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2368
 repository.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2369
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2370
-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2371
+Please see \fBhg help urls\fP for important details about \fBssh://\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2372
 URLs. If DESTINATION is omitted, a default path will be used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2373
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2374
 Returns 0 if push was successful, 1 if nothing to push.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2375
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2376
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2377
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2378
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2379
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2380
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2381
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2382
@@ -3176,7 +3149,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2383
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2384
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2385
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2386
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2387
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2388
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2389
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2390
 .SS recover
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2391
@@ -3184,9 +3157,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2392
 roll back an interrupted transaction:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2393
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2394
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2395
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2396
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2397
 hg recover
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2398
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2399
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2400
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2401
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2402
 Recover from an interrupted commit or pull.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2403
@@ -3201,16 +3174,16 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2404
 remove the specified files on the next commit:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2405
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2406
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2407
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2408
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2409
 hg remove [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2410
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2411
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2412
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2413
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2414
 Schedule the indicated files for removal from the current branch.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2415
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2416
 This command schedules the files to be removed at the next commit.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2417
-To undo a remove before that, see \%\fBhg revert\fP\:. To undo added
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2418
-files, see \%\fBhg forget\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2419
+To undo a remove before that, see \fBhg revert\fP. To undo added
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2420
+files, see \fBhg forget\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2421
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2422
 \-A/\-\-after can be used to remove only files that have already
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2423
 been deleted, \-f/\-\-force can be used to force deletion, and \-Af
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2424
@@ -3220,7 +3193,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2425
 The following table details the behavior of remove for different
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2426
 file states (columns) and option combinations (rows). The file
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2427
 states are Added [A], Clean [C], Modified [M] and Missing [!]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2428
-(as reported by \%\fBhg status\fP\:). The actions are Warn, Remove
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2429
+(as reported by \fBhg status\fP). The actions are Warn, Remove
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2430
 (from branch) and Delete (from disk):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2431
 .TS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2432
 center;
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2433
@@ -3294,7 +3267,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2434
 Returns 0 on success, 1 if any warnings encountered.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2435
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2436
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2437
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2438
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2439
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2440
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2441
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2442
@@ -3311,23 +3284,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2443
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2444
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2445
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2446
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2447
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2448
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2449
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2450
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2451
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2452
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2453
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2454
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2455
 aliases: rm
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2456
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2457
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2458
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2459
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2460
 .SS rename
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2461
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2462
 rename files; equivalent of copy + remove:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2463
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2464
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2465
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2466
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2467
 hg rename [OPTION]... SOURCE... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2468
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2469
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2470
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2471
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2472
 Mark dest as copies of sources; mark sources for deletion. If dest
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2473
@@ -3339,12 +3312,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2474
 operation is recorded, but no copying is performed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2475
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2476
 This command takes effect at the next commit. To undo a rename
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2477
-before that, see \%\fBhg revert\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2478
+before that, see \fBhg revert\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2479
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2480
 Returns 0 on success, 1 if errors are encountered.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2481
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2482
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2483
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2484
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2485
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2486
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2487
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2488
@@ -3365,23 +3338,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2489
 .B \-n,  \-\-dry\-run
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2490
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2491
 do not perform actions, just print output
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2492
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2493
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2494
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2495
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2496
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2497
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2498
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2499
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2500
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2501
 aliases: move mv
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2502
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2503
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2504
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2505
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2506
 .SS resolve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2507
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2508
 redo merges or set/view the merge status of files:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2509
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2510
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2511
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2512
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2513
 hg resolve [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2514
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2515
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2516
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2517
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2518
 Merges with unresolved conflicts are often the result of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2519
@@ -3388,15 +3361,15 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2520
 non\-interactive merging using the \fBinternal:merge\fP configuration
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2521
 setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2522
 command is used to manage the files involved in a merge, after
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2523
-\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2524
-working directory must have two parents). See \%\fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2525
-merge\-tools\fP\: for information on configuring merge tools.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2526
+\fBhg merge\fP has been run, and before \fBhg commit\fP is run (i.e. the
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2527
+working directory must have two parents). See \fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2528
+merge\-tools\fP for information on configuring merge tools.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2529
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2530
 The resolve command can be used in the following ways:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2531
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2532
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2533
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2534
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2535
-\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2536
+\fBhg resolve [\-\-tool TOOL] FILE...\fP: attempt to re\-merge the specified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2537
 files, discarding any previous merge attempts. Re\-merging is not
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2538
 performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2539
 to select all unresolved files. \fB\-\-tool\fP can be used to specify
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2540
@@ -3405,27 +3378,27 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2541
 contents are saved with a \fB.orig\fP suffix.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2542
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2543
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2544
-\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2545
+\fBhg resolve \-m [FILE]\fP: mark a file as having been resolved
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2546
 (e.g. after having manually fixed\-up the files). The default is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2547
 to mark all unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2548
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2549
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2550
-\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2551
+\fBhg resolve \-u [FILE]...\fP: mark a file as unresolved. The
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2552
 default is to mark all resolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2553
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2554
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2555
-\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2556
+\fBhg resolve \-l\fP: list files which had or still have conflicts.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2557
 In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2558
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2559
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2560
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2561
 Note that Mercurial will not let you commit files with unresolved
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2562
-merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2563
+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2564
 commit after a conflicting merge.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2565
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2566
 Returns 0 on success, 1 if any files fail a resolve attempt.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2567
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2568
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2569
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2570
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2571
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2572
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2573
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2574
@@ -3458,7 +3431,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2575
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2576
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2577
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2578
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2579
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2580
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2581
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2582
 .SS revert
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2583
@@ -3466,15 +3439,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2584
 restore files to their checkout state:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2585
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2586
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2587
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2588
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2589
 hg revert [OPTION]... [\-r REV] [NAME]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2590
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2591
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2592
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2593
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2594
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2595
-To check out earlier revisions, you should use \%\fBhg update REV\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2596
+To check out earlier revisions, you should use \fBhg update REV\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2597
 To cancel an uncommitted merge (and lose your changes),
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2598
-use \%\fBhg update \-\-clean .\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2599
+use \fBhg update \-\-clean .\fP.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  2600
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2601
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2602
 With no revision specified, revert the specified files or directories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2603
@@ -3488,18 +3461,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2604
 directories to their states as of a specific revision. Because
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2605
 revert does not change the working directory parents, this will
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2606
 cause these files to appear modified. This can be helpful to "back
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2607
-out" some or all of an earlier change. See \%\fBhg backout\fP\: for a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2608
+out" some or all of an earlier change. See \fBhg backout\fP for a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2609
 related method.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2610
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2611
 Modified files are saved with a .orig suffix before reverting.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2612
 To disable these backups, use \-\-no\-backup.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2613
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2614
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2615
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2616
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2617
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2618
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2619
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2620
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2621
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2622
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2623
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2624
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2625
@@ -3528,7 +3501,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2626
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2627
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2628
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2629
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2630
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2631
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2632
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2633
 .SS rollback
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2634
@@ -3536,12 +3509,12 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2635
 roll back the last transaction (DANGEROUS) (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2636
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2637
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2638
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2639
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2640
 hg rollback
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2641
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2642
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2643
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2644
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2645
-Please use \%\fBhg commit \-\-amend\fP\: instead of rollback to correct
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2646
+Please use \fBhg commit \-\-amend\fP instead of rollback to correct
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2647
 mistakes in the last commit.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2648
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2649
 This command should be used with care. There is only one level of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2650
@@ -3556,7 +3529,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2651
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2652
 For example, the following commands are transactional, and their
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2653
 effects can be rolled back:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2654
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2655
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2656
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2657
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2658
 commit
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2659
@@ -3572,10 +3545,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2660
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2661
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2662
 unbundle
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2663
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2664
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2665
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2666
 To avoid permanent data loss, rollback will refuse to rollback a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2667
-commit transaction if it isn\(aqt checked out. Use \-\-force to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2668
+commit transaction if it isn't checked out. Use \-\-force to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2669
 override this protection.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2670
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2671
 This command is not intended for use on public repositories. Once
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2672
@@ -3588,7 +3561,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2673
 Returns 0 on success, 1 if no rollback data is available.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2674
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2675
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2676
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2677
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2678
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2679
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2680
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2681
@@ -3597,15 +3570,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2682
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2683
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2684
 ignore safety measures
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2685
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2686
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2687
 .SS root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2688
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2689
 print the root (top) of the current working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2690
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2691
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2692
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2693
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2694
 hg root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2695
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2696
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2697
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2698
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2699
 Print the root directory of the current repository.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2700
@@ -3616,9 +3589,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2701
 start stand\-alone webserver:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2702
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2703
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2704
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2705
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2706
 hg serve [OPTION]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2707
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2708
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2709
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2710
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2711
 Start a local HTTP repository browser and pull server. You can use
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2712
@@ -3643,7 +3616,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2713
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2714
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2715
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2716
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2717
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2718
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2719
 .BI \-A,  \-\-accesslog \ <FILE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2720
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2721
@@ -3712,15 +3685,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2722
 .BI \-\-certificate \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2723
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2724
 SSL certificate file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2725
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2726
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2727
 .SS status
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2728
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2729
 show changed files in the working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2730
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2731
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2732
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2733
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2734
 hg status [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2735
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2736
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2737
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2738
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2739
 Show status of files in the repository. If names are given, only
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2740
@@ -3748,7 +3721,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2741
 The codes used to show the status of files are:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2742
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2743
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2744
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2745
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2746
 M = modified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2747
 A = added
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2748
 R = removed
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2749
@@ -3757,11 +3730,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2750
 ? = not tracked
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2751
 I = ignored
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2752
   = origin of the previous file (with \-\-copies)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2753
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2754
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2755
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2756
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2757
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2758
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2759
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2760
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2761
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2762
 show changes in the working directory relative to a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2763
@@ -3768,9 +3741,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2764
 changeset:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2765
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2766
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2767
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2768
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2769
 hg status \-\-rev 9353
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2770
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2771
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2772
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2773
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2774
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2775
@@ -3777,9 +3750,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2776
 show all changes including copies in an existing changeset:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2777
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2778
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2779
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2780
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2781
 hg status \-\-copies \-\-change 9353
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2782
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2783
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2784
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2785
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2786
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2787
@@ -3786,16 +3759,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2788
 get a NUL separated list of added files, suitable for xargs:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2789
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2790
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2791
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2792
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2793
 hg status \-an0
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2794
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2795
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2796
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2797
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2798
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2799
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2800
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2801
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2802
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2803
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2804
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2805
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2806
 .B \-A,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2807
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2808
@@ -3860,23 +3833,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2809
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2810
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2811
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2812
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2813
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2814
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2815
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2816
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2817
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2818
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2819
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2820
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2821
 aliases: st
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2822
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2823
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2824
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2825
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2826
 .SS summary
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2827
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2828
 summarize working directory state:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2829
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2830
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2831
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2832
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2833
 hg summary [\-\-remote]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2834
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2835
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2836
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2837
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2838
 This generates a brief summary of the working directory state,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2839
@@ -3888,7 +3861,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2840
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2841
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2842
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2843
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2844
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2845
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2846
 .B \-\-remote
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2847
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2848
@@ -3895,15 +3868,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2849
 check for push and pull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2850
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2851
 aliases: sum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2852
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2853
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2854
 .SS tag
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2855
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2856
 add one or more tags for the current or given revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2857
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2858
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2859
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2860
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2861
 hg tag [\-f] [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2862
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2863
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2864
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2865
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2866
 Name a particular revision using <name>.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2867
@@ -3924,11 +3897,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2868
 repositories).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2869
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2870
 Tag commits are usually made at the head of a branch. If the parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2871
-of the working directory is not a branch head, \%\fBhg tag\fP\: aborts; use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2872
+of the working directory is not a branch head, \fBhg tag\fP aborts; use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2873
 \-f/\-\-force to force the tag commit to be based on a non\-head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2874
 changeset.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2875
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2876
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2877
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2878
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2879
 Since tag names have priority over branch names during revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2880
 lookup, using an existing branch name as a tag name is discouraged.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2881
@@ -3936,7 +3909,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2882
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2883
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2884
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2885
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2886
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2887
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2888
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2889
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2890
@@ -3969,15 +3942,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2891
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2892
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2893
 record the specified user as committer
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2894
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2895
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2896
 .SS tags
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2897
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2898
 list repository tags:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2899
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2900
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2901
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2902
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2903
 hg tags
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2904
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2905
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2906
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2907
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2908
 This lists both regular and local tags. When the \-v/\-\-verbose
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2909
@@ -3989,9 +3962,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2910
 show the tip revision (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2911
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2912
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2913
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2914
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2915
 hg tip [\-p] [\-g]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2916
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2917
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2918
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2919
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2920
 The tip revision (usually just called the tip) is the changeset
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2921
@@ -4003,12 +3976,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2922
 that repository becomes the current tip. The "tip" tag is special
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2923
 and cannot be renamed or assigned to a different changeset.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2924
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2925
-This command is deprecated, please use \%\fBhg heads\fP\: instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2926
+This command is deprecated, please use \fBhg heads\fP instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2927
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2928
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2929
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2930
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2931
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2932
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2933
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2934
 .B \-p,  \-\-patch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2935
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2936
@@ -4025,15 +3998,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2937
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2938
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2939
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2940
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2941
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2942
 .SS unbundle
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2943
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2944
 apply one or more changegroup files:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2945
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2946
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2947
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2948
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2949
 hg unbundle [\-u] FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2950
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2951
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2952
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2953
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2954
 Apply one or more compressed changegroup files generated by the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2955
@@ -4042,32 +4015,32 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2956
 Returns 0 on success, 1 if an update has unresolved files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2957
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2958
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2959
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2960
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2961
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2962
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2963
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2964
 update to new branch head if changesets were unbundled
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2965
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2966
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2967
 .SS update
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2968
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2969
 update working directory (or switch revisions):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2970
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2971
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2972
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2973
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2974
 hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2975
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2976
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2977
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2978
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2979
-Update the repository\(aqs working directory to the specified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2980
+Update the repository's working directory to the specified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2981
 changeset. If no changeset is specified, update to the tip of the
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2982
-current named branch and move the current bookmark (see \%\fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2983
-bookmarks\fP\:).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2984
+current named branch and move the current bookmark (see \fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2985
+bookmarks\fP).
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2986
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2987
-Update sets the working directory\(aqs parent revision to the specified
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2988
-changeset (see \%\fBhg help parents\fP\:).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2989
+Update sets the working directory's parent revision to the specified
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2990
+changeset (see \fBhg help parents\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2991
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2992
 If the changeset is not a descendant or ancestor of the working
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2993
-directory\(aqs parent, the update is aborted. With the \-c/\-\-check
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2994
+directory's parent, the update is aborted. With the \-c/\-\-check
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2995
 option, the working directory is checked for uncommitted changes; if
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2996
 none are found, the working directory is updated to the specified
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2997
 changeset.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2998
@@ -4074,12 +4047,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2999
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3000
 The following rules apply when the working directory contains
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3001
 uncommitted changes:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3002
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3003
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3004
 .IP 1. 3
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3005
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3006
 If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3007
 the requested changeset is an ancestor or descendant of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3008
-the working directory\(aqs parent, the uncommitted changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3009
+the working directory's parent, the uncommitted changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3010
 are merged into the requested changeset and the merged
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3011
 result is left uncommitted. If the requested changeset is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3012
 not an ancestor or descendant (that is, it is on another
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3013
@@ -4093,23 +4066,23 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3014
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3015
 With the \-C/\-\-clean option, uncommitted changes are discarded and
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3016
 the working directory is updated to the requested changeset.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3017
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3018
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3019
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3020
 To cancel an uncommitted merge (and lose your changes), use
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3021
-\%\fBhg update \-\-clean .\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3022
+\fBhg update \-\-clean .\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3023
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3024
 Use null as the changeset to remove the working directory (like
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3025
-\%\fBhg clone \-U\fP\:).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3026
+\fBhg clone \-U\fP).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3027
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3028
 If you want to revert just one file to an older revision, use
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3029
-\%\fBhg revert [\-r REV] NAME\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3030
+\fBhg revert [\-r REV] NAME\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3031
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3032
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3033
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3034
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3035
 Returns 0 on success, 1 if there are unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3036
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3037
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3038
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3039
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3040
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3041
 .B \-C,  \-\-clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3042
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3043
@@ -4128,25 +4101,25 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3044
 revision
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3045
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3046
 aliases: up checkout co
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3047
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3048
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3049
 .SS verify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3050
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3051
 verify the integrity of the repository:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3052
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3053
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3054
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3055
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3056
 hg verify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3057
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3058
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3059
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3060
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3061
 Verify the integrity of the current repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3062
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3063
-This will perform an extensive check of the repository\(aqs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3064
+This will perform an extensive check of the repository's
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3065
 integrity, validating the hashes and checksums of each entry in
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3066
 the changelog, manifest, and tracked files, as well as the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3067
 integrity of their crosslinks and indices.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3068
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3069
-Please see \%http://mercurial.selenic.com/wiki/RepositoryCorruption\:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3070
+Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3071
 for more information about recovery from corruption of the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3072
 repository.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3073
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3074
@@ -4156,9 +4129,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3075
 output version and copyright information:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3076
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3077
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3078
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3079
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3080
 hg version
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3081
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3082
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3083
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3084
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3085
 output version and copyright information
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3086
@@ -4165,7 +4138,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3087
 .SH DATE FORMATS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3088
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3089
 Some commands allow the user to specify a date, e.g.:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3090
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3091
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3092
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3093
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3094
 backout, commit, import, tag: Specify the commit date.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3095
@@ -4172,10 +4145,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3096
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3097
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3098
 log, revert, update: Select revision(s) by date.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3099
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3100
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3101
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3102
 Many date formats are valid. Here are some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3103
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3104
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3105
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3106
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3107
 \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3108
@@ -4224,14 +4197,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3109
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3110
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3111
 \fBnow\fP \- right now
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3112
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3113
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3114
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3115
-Lastly, there is Mercurial\(aqs internal format:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3116
-.INDENT 0.0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3117
+Lastly, there is Mercurial's internal format:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3118
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3119
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3120
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3121
 \fB1165411109 0\fP (Wed Dec 6 13:18:29 2006 UTC)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3122
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3123
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3124
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3125
 This is the internal representation format for dates. The first number
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3126
 is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3127
@@ -4239,7 +4212,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3128
 (negative if the timezone is east of UTC).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3129
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3130
 The log command also accepts date ranges:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3131
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3132
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3133
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3134
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3135
 \fB<DATE\fP \- at or before a given date/time
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3136
@@ -4252,16 +4225,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3137
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3138
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3139
 \fB\-DAYS\fP \- within a given number of days of today
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3140
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3141
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3142
 .SH DIFF FORMATS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3143
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3144
-Mercurial\(aqs default format for showing changes between two versions of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3145
+Mercurial's default format for showing changes between two versions of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3146
 a file is compatible with the unified format of GNU diff, which can be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3147
 used by GNU patch and many other standard tools.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3148
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3149
 While this standard format is often enough, it does not encode the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3150
 following information:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3151
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3152
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3153
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3154
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3155
 executable status and other permission bits
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3156
@@ -4274,7 +4247,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3157
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3158
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3159
 creation or deletion of empty files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3160
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3161
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3162
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3163
 Mercurial also supports the extended diff format from the git VCS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3164
 which addresses these limitations. The git diff format is not produced
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3165
@@ -4282,26 +4255,26 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3166
 format.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3167
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3168
 This means that when generating diffs from a Mercurial repository
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3169
-(e.g. with \%\fBhg export\fP\:), you should be careful about things like file
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3170
+(e.g. with \fBhg export\fP), you should be careful about things like file
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3171
 copies and renames or other things mentioned above, because when
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3172
 applying a standard diff to a different repository, this extra
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3173
-information is lost. Mercurial\(aqs internal operations (like push and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3174
+information is lost. Mercurial's internal operations (like push and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3175
 pull) are not affected by this, because they use an internal binary
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3176
 format for communicating changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3177
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3178
 To make Mercurial produce the git extended diff format, use the \-\-git
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3179
-option available for many commands, or set \(aqgit = True\(aq in the [diff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3180
+option available for many commands, or set 'git = True' in the [diff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3181
 section of your configuration file. You do not need to set this option
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3182
 when importing diffs in this format or using them in the mq extension.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3183
 .SH ENVIRONMENT VARIABLES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3184
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3185
+.RS 0
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3186
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3187
 .B HG
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3188
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3189
-Path to the \(aqhg\(aq executable, automatically passed when running
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3190
+Path to the 'hg' executable, automatically passed when running
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3191
 hooks, extensions or external tools. If unset or empty, this is
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3192
-the hg executable\(aqs name if it\(aqs frozen, or an executable named
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3193
-\(aqhg\(aq (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3194
+the hg executable's name if it's frozen, or an executable named
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3195
+\&'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3196
 Windows) is searched.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3197
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3198
 .B HGEDITOR
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3199
@@ -4319,9 +4292,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3200
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3201
 .B HGENCODINGMODE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3202
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3203
-This sets Mercurial\(aqs behavior for handling unknown characters
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3204
+This sets Mercurial's behavior for handling unknown characters
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3205
 while transcoding user input. The default is "strict", which
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3206
-causes Mercurial to abort if it can\(aqt map a character. Other
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3207
+causes Mercurial to abort if it can't map a character. Other
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3208
 settings include "replace", which replaces unknown characters, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3209
 "ignore", which drops them. This setting can be overridden with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3210
 the \-\-encodingmode command\-line option.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3211
@@ -4328,7 +4301,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3212
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3213
 .B HGENCODINGAMBIGUOUS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3214
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3215
-This sets Mercurial\(aqs behavior for handling characters with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3216
+This sets Mercurial's behavior for handling characters with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3217
 "ambiguous" widths like accented Latin characters with East Asian
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3218
 fonts. By default, Mercurial assumes ambiguous characters are
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3219
 narrow, set this variable to "wide" if such characters cause
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3220
@@ -4350,19 +4323,19 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3221
 the .hg/hgrc from the current repository is read.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3222
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3223
 For each element in HGRCPATH:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3224
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3225
+.RS 7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3226
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3227
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3228
-if it\(aqs a directory, all files ending with .rc are added
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3229
+if it's a directory, all files ending with .rc are added
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3230
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3231
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3232
 otherwise, the file itself will be added
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3233
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3234
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3235
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3236
 .B HGPLAIN
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3237
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3238
 When set, this disables any configuration settings that might
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3239
-change Mercurial\(aqs default output. This includes encoding,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3240
+change Mercurial's default output. This includes encoding,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3241
 defaults, verbose mode, debug mode, quiet mode, tracebacks, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3242
 localization. This can be useful when scripting against Mercurial
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3243
 in the face of existing user configuration.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3244
@@ -4383,7 +4356,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3245
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3246
 This is the string used as the author of a commit. If not set,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3247
 available values will be considered in this order:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3248
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3249
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3250
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3251
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3252
 HGUSER (deprecated)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3253
@@ -4399,7 +4372,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3254
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3255
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3256
 LOGNAME (with \fB@hostname\fP appended)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3257
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3258
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3259
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3260
 (deprecated, use configuration file)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3261
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3262
@@ -4422,13 +4395,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3263
 editor it uses is determined by looking at the environment
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3264
 variables HGEDITOR, VISUAL and EDITOR, in that order. The first
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3265
 non\-empty one is chosen. If all of them are empty, the editor
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3266
-defaults to \(aqvi\(aq.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3267
+defaults to 'vi'.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3268
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3269
 .B PYTHONPATH
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3270
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3271
 This is used by Python to find imported modules and may need to be
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3272
 set appropriately if this Mercurial is not installed system\-wide.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3273
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3274
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3275
 .SH USING ADDITIONAL FEATURES
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3276
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3277
 Mercurial has the ability to add new features through the use of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3278
@@ -4441,22 +4414,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3279
 like this:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3280
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3281
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3282
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3283
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3284
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3285
 foo =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3286
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3287
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3288
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3289
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3290
 You may also specify the full path to an extension:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3291
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3292
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3293
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3294
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3295
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3296
 myfeature = ~/.hgext/myfeature.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3297
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3298
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3299
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3300
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3301
-See \%\fBhg help config\fP\: for more information on configuration files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3302
+See \fBhg help config\fP for more information on configuration files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3303
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3304
 Extensions are not loaded by default for a variety of reasons:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3305
 they can increase startup overhead; they may be meant for advanced
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3306
@@ -4470,19 +4443,19 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3307
 broader scope, prepend its path with !:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3308
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3309
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3310
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3311
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3312
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3313
 # disabling extension bar residing in /path/to/extension/bar.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3314
 bar = !/path/to/extension/bar.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3315
 # ditto, but no path was supplied for extension baz
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3316
 baz = !
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3317
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3318
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3319
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3320
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3321
 disabled extensions:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3322
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3323
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3324
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3325
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3326
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3327
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3328
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3329
 .B acl
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3330
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3331
@@ -4611,9 +4584,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3332
 .B zeroconf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3333
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3334
 discover and advertise repositories on the local network
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3335
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3336
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3337
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3338
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3339
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3340
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3341
 .SH SPECIFYING FILE SETS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3342
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3343
 Mercurial supports a functional language for selecting a set of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3344
@@ -4620,7 +4593,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3345
 files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3346
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3347
 Like other file patterns, this pattern type is indicated by a prefix,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3348
-\(aqset:\(aq. The language supports a number of predicates which are joined
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3349
+\&'set:'. The language supports a number of predicates which are joined
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3350
 by infix operators. Parenthesis can be used for grouping.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3351
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3352
 Identifiers such as filenames or patterns must be quoted with single
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3353
@@ -4631,18 +4604,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3354
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3355
 Special characters can be used in quoted identifiers by escaping them,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3356
 e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3357
-interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3358
+interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3359
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3360
 There is a single prefix operator:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3361
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3362
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3363
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3364
 .B \fBnot x\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3365
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3366
 Files not in x. Short form is \fB! x\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3367
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3368
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3369
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3370
 These are the supported infix operators:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3371
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3372
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3373
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3374
 .B \fBx and y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3375
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3376
@@ -4656,10 +4629,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3377
 .B \fBx \- y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3378
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3379
 Files in x but not in y.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3380
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3381
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3382
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3383
 The following predicates are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3384
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3385
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3386
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3387
 .B \fBadded()\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3388
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3389
@@ -4725,7 +4698,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3390
 .B \fBsize(expression)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3391
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3392
 File size matches the given expression. Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3393
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3394
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3395
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3396
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3397
 1k (files from 1024 to 2047 bytes)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3398
@@ -4738,7 +4711,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3399
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3400
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3401
 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3402
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3403
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3404
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3405
 .B \fBsubrepo([pattern])\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3406
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3407
@@ -4756,18 +4729,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3408
 .B \fBunresolved()\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3409
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3410
 File that is marked unresolved according to the resolve state.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3411
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3412
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3413
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3414
 Some sample queries:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3415
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3416
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3417
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3418
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3419
 Show status of files that appear to be binary in the working directory:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3420
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3421
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3422
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3423
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3424
 hg status \-A "set:binary()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3425
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3426
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3427
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3428
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3429
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3430
@@ -4774,9 +4747,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3431
 Forget files that are in .hgignore but are already tracked:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3432
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3433
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3434
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3435
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3436
 hg forget "set:hgignore() and not ignored()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3437
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3438
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3439
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3440
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3441
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3442
@@ -4783,9 +4756,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3443
 Find text files that contain a string:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3444
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3445
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3446
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3447
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3448
 hg locate "set:grep(magic) and not binary()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3449
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3450
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3451
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3452
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3453
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3454
@@ -4792,9 +4765,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3455
 Find C files in a non\-standard encoding:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3456
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3457
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3458
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3459
-hg locate "set:**.c and not encoding(\(aqUTF\-8\(aq)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3460
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3461
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3462
+hg locate "set:**.c and not encoding('UTF\-8')"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3463
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3464
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3465
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3466
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3467
@@ -4801,9 +4774,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3468
 Revert copies of large binary files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3469
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3470
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3471
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3472
-hg revert "set:copied() and binary() and size(\(aq>1M\(aq)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3473
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3474
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3475
+hg revert "set:copied() and binary() and size('>1M')"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3476
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3477
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3478
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3479
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3480
@@ -4810,15 +4783,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3481
 Remove files listed in foo.lst that contain the letter a or b:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3482
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3483
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3484
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3485
-hg remove "set: \(aqlistfile:foo.lst\(aq and (**a* or **b*)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3486
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3487
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3488
+hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3489
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3490
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3491
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3492
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3493
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3494
-See also \%\fBhg help patterns\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3495
+See also \fBhg help patterns\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3496
 .SH GLOSSARY
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3497
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3498
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3499
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3500
 .B Ancestor
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3501
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3502
@@ -4826,7 +4799,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3503
 changesets from a given changeset. More precisely, the ancestors
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3504
 of a changeset can be defined by two properties: a parent of a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3505
 changeset is an ancestor, and a parent of an ancestor is an
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3506
-ancestor. See also: \(aqDescendant\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3507
+ancestor. See also: 'Descendant'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3508
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3509
 .B Bookmark
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3510
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3511
@@ -4833,7 +4806,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3512
 Bookmarks are pointers to certain commits that move when
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3513
 committing. They are similar to tags in that it is possible to use
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3514
 bookmark names in all places where Mercurial expects a changeset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3515
-ID, e.g., with \%\fBhg update\fP\:. Unlike tags, bookmarks move along
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3516
+ID, e.g., with \fBhg update\fP. Unlike tags, bookmarks move along
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3517
 when you make a commit.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3518
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3519
 Bookmarks can be renamed, copied and deleted. Bookmarks are local,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3520
@@ -4845,9 +4818,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3521
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3522
 (Noun) A child changeset that has been created from a parent that
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3523
 is not a head. These are known as topological branches, see
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3524
-\(aqBranch, topological\(aq. If a topological branch is named, it becomes
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3525
+\&'Branch, topological'. If a topological branch is named, it becomes
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3526
 a named branch. If a topological branch is not named, it becomes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3527
-an anonymous branch. See \(aqBranch, anonymous\(aq and \(aqBranch, named\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3528
+an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3529
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3530
 Branches may be created when changes are pulled from or pushed to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3531
 a remote repository, since new heads may be created by these
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3532
@@ -4862,7 +4835,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3533
 (Verb) The action of creating a child changeset which results in
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3534
 its parent having more than one child.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3535
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3536
-Example: "I\(aqm going to branch at X".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3537
+Example: "I'm going to branch at X".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3538
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3539
 .B Branch, anonymous
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3540
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3541
@@ -4881,19 +4854,19 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3542
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3543
 .B Branch head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3544
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3545
-See \(aqHead, branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3546
+See 'Head, branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3547
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3548
 .B Branch, inactive
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3549
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3550
 If a named branch has no topological heads, it is considered to be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3551
 inactive. As an example, a feature branch becomes inactive when it
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3552
-is merged into the default branch. The \%\fBhg branches\fP\: command
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3553
+is merged into the default branch. The \fBhg branches\fP command
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3554
 shows inactive branches by default, though they can be hidden with
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3555
-\%\fBhg branches \-\-active\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3556
+\fBhg branches \-\-active\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3557
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3558
 NOTE: this concept is deprecated because it is too implicit.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3559
-Branches should now be explicitly closed using \%\fBhg commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3560
-\-\-close\-branch\fP\: when they are no longer needed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3561
+Branches should now be explicitly closed using \fBhg commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3562
+\-\-close\-branch\fP when they are no longer needed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3563
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3564
 .B Branch, named
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3565
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3566
@@ -4900,8 +4873,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3567
 A collection of changesets which have the same branch name. By
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3568
 default, children of a changeset in a named branch belong to the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3569
 same named branch. A child can be explicitly assigned to a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3570
-different branch. See \%\fBhg help branch\fP\:, \%\fBhg help branches\fP\: and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3571
-\%\fBhg commit \-\-close\-branch\fP\: for more information on managing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3572
+different branch. See \fBhg help branch\fP, \fBhg help branches\fP and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3573
+\fBhg commit \-\-close\-branch\fP for more information on managing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3574
 branches.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3575
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3576
 Named branches can be thought of as a kind of namespace, dividing
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3577
@@ -4914,7 +4887,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3578
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3579
 .B Branch tip
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3580
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3581
-See \(aqTip, branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3582
+See 'Tip, branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3583
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3584
 .B Branch, topological
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3585
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3586
@@ -4964,24 +4937,24 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3587
 revision. This use should probably be avoided where possible, as
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3588
 changeset is much more appropriate than checkout in this context.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3589
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3590
-Example: "I\(aqm using checkout X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3591
+Example: "I'm using checkout X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3592
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3593
 (Verb) Updating the working directory to a specific changeset. See
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3594
-\%\fBhg help update\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3595
+\fBhg help update\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3596
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3597
-Example: "I\(aqm going to check out changeset X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3598
+Example: "I'm going to check out changeset X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3599
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3600
 .B Child changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3601
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3602
-See \(aqChangeset, child\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3603
+See 'Changeset, child'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3604
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3605
 .B Close changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3606
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3607
-See \(aqHead, closed branch\(aq
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3608
+See 'Head, closed branch'
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3609
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3610
 .B Closed branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3611
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3612
-See \(aqBranch, closed\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3613
+See 'Branch, closed'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3614
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3615
 .B Clone
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3616
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3617
@@ -4990,13 +4963,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3618
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3619
 Example: "Is your clone up to date?".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3620
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3621
-(Verb) The process of creating a clone, using \%\fBhg clone\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3622
+(Verb) The process of creating a clone, using \fBhg clone\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3623
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3624
-Example: "I\(aqm going to clone the repository".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3625
+Example: "I'm going to clone the repository".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3626
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3627
 .B Closed branch head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3628
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3629
-See \(aqHead, closed branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3630
+See 'Head, closed branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3631
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3632
 .B Commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3633
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3634
@@ -5021,13 +4994,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3635
 system (DVCS) can be described as a directed acyclic graph (DAG),
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3636
 consisting of nodes and edges, where nodes correspond to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3637
 changesets and edges imply a parent \-> child relation. This graph
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3638
-can be visualized by graphical tools such as \%\fBhg log \-\-graph\fP\:. In
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3639
+can be visualized by graphical tools such as \fBhg log \-\-graph\fP. In
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3640
 Mercurial, the DAG is limited by the requirement for children to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3641
 have at most two parents.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3642
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3643
 .B Default branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3644
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3645
-See \(aqBranch, default\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3646
+See 'Branch, default'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3647
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3648
 .B Descendant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3649
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3650
@@ -5035,7 +5008,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3651
 from a given changeset. More precisely, the descendants of a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3652
 changeset can be defined by two properties: the child of a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3653
 changeset is a descendant, and the child of a descendant is a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3654
-descendant. See also: \(aqAncestor\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3655
+descendant. See also: 'Ancestor'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3656
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3657
 .B Diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3658
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3659
@@ -5060,7 +5033,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3660
 Mercurial, that will be recorded in the next commit. The working
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3661
 directory initially corresponds to the snapshot at an existing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3662
 changeset, known as the parent of the working directory. See
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3663
-\(aqParent, working directory\(aq. The state may be modified by changes
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3664
+\&'Parent, working directory'. The state may be modified by changes
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3665
 to the files introduced manually or by a merge. The repository
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3666
 metadata exists in the .hg directory inside the working directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3667
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3668
@@ -5068,17 +5041,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3669
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3670
 Changesets in the draft phase have not been shared with publishing
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3671
 repositories and may thus be safely changed by history\-modifying
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3672
-extensions. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3673
+extensions. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3674
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3675
 .B Graph
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3676
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3677
-See DAG and \%\fBhg log \-\-graph\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3678
+See DAG and \fBhg log \-\-graph\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3679
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3680
 .B Head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3681
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3682
-The term \(aqhead\(aq may be used to refer to both a branch head or a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3683
-repository head, depending on the context. See \(aqHead, branch\(aq and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3684
-\(aqHead, repository\(aq for specific definitions.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3685
+The term 'head' may be used to refer to both a branch head or a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3686
+repository head, depending on the context. See 'Head, branch' and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3687
+\&'Head, repository' for specific definitions.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3688
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3689
 Heads are where development generally takes place and are the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3690
 usual targets for update and merge operations.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3691
@@ -5090,9 +5063,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3692
 .B Head, closed branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3693
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3694
 A changeset that marks a head as no longer interesting. The closed
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3695
-head is no longer listed by \%\fBhg heads\fP\:. A branch is considered
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3696
+head is no longer listed by \fBhg heads\fP. A branch is considered
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3697
 closed when all its heads are closed and consequently is not
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3698
-listed by \%\fBhg branches\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3699
+listed by \fBhg branches\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3700
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3701
 Closed heads can be re\-opened by committing new changeset as the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3702
 child of the changeset that marks a head as closed.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3703
@@ -5121,11 +5094,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3704
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3705
 .B Immutable history
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3706
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3707
-See \(aqHistory, immutable\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3708
+See 'History, immutable'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3709
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3710
 .B Merge changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3711
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3712
-See \(aqChangeset, merge\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3713
+See 'Changeset, merge'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3714
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3715
 .B Manifest
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3716
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3717
@@ -5142,7 +5115,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3718
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3719
 .B Named branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3720
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3721
-See \(aqBranch, named\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3722
+See 'Branch, named'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3723
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3724
 .B Null changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3725
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3726
@@ -5149,30 +5122,30 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3727
 The empty changeset. It is the parent state of newly\-initialized
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3728
 repositories and repositories with no checked out revision. It is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3729
 thus the parent of root changesets and the effective ancestor when
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3730
-merging unrelated changesets. Can be specified by the alias \(aqnull\(aq
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3731
-or by the changeset ID \(aq000000000000\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3732
+merging unrelated changesets. Can be specified by the alias 'null'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3733
+or by the changeset ID '000000000000'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3734
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3735
 .B Parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3736
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3737
-See \(aqChangeset, parent\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3738
+See 'Changeset, parent'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3739
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3740
 .B Parent changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3741
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3742
-See \(aqChangeset, parent\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3743
+See 'Changeset, parent'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3744
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3745
 .B Parent, working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3746
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3747
 The working directory parent reflects a virtual revision which is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3748
 the child of the changeset (or two changesets with an uncommitted
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3749
-merge) shown by \%\fBhg parents\fP\:. This is changed with
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3750
-\%\fBhg update\fP\:. Other commands to see the working directory parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3751
-are \%\fBhg summary\fP\: and \%\fBhg id\fP\:. Can be specified by the alias ".".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3752
+merge) shown by \fBhg parents\fP. This is changed with
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3753
+\fBhg update\fP. Other commands to see the working directory parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3754
+are \fBhg summary\fP and \fBhg id\fP. Can be specified by the alias ".".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3755
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3756
 .B Patch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3757
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3758
 (Noun) The product of a diff operation.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3759
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3760
-Example: "I\(aqve sent you my patch."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3761
+Example: "I've sent you my patch."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3762
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3763
 (Verb) The process of using a patch file to transform one
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3764
 changeset into another.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3765
@@ -5182,13 +5155,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3766
 .B Phase
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3767
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3768
 A per\-changeset state tracking how the changeset has been or
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3769
-should be shared. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3770
+should be shared. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3771
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3772
 .B Public
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3773
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3774
 Changesets in the public phase have been shared with publishing
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3775
-repositories and are therefore considered immutable. See \%\fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3776
-phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3777
+repositories and are therefore considered immutable. See \fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3778
+phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3779
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3780
 .B Pull
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3781
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3782
@@ -5196,7 +5169,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3783
 not in the local repository are brought into the local
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3784
 repository. Note that this operation without special arguments
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3785
 only updates the repository, it does not update the files in the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3786
-working directory. See \%\fBhg help pull\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3787
+working directory. See \fBhg help pull\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3788
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3789
 .B Push
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3790
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3791
@@ -5204,7 +5177,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3792
 not in a remote repository are sent to the remote repository. Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3793
 that this operation only adds changesets which have been committed
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3794
 locally to the remote repository. Uncommitted changes are not
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3795
-sent. See \%\fBhg help push\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3796
+sent. See \fBhg help push\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3797
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3798
 .B Repository
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3799
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3800
@@ -5217,13 +5190,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3801
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3802
 .B Repository head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3803
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3804
-See \(aqHead, repository\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3805
+See 'Head, repository'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3806
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3807
 .B Revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3808
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3809
 A state of the repository at some point in time. Earlier revisions
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3810
-can be updated to by using \%\fBhg update\fP\:.  See also \(aqRevision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3811
-number\(aq; See also \(aqChangeset\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3812
+can be updated to by using \fBhg update\fP.  See also 'Revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3813
+number'; See also 'Changeset'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3814
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3815
 .B Revision number
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3816
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3817
@@ -5232,7 +5205,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3818
 to a repository, starting with revision number 0. Note that the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3819
 revision number may be different in each clone of a repository. To
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3820
 identify changesets uniquely between different clones, see
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3821
-\(aqChangeset id\(aq.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3822
+\&'Changeset id'.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3823
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3824
 .B Revlog
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3825
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3826
@@ -5243,7 +5216,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3827
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3828
 .B Rewriting history
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3829
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3830
-See \(aqHistory, rewriting\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3831
+See 'History, rewriting'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3832
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3833
 .B Root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3834
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3835
@@ -5253,13 +5226,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3836
 .B Secret
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3837
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3838
 Changesets in the secret phase may not be shared via push, pull,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3839
-or clone. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3840
+or clone. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3841
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3842
 .B Tag
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3843
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3844
 An alternative name given to a changeset. Tags can be used in all
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3845
 places where Mercurial expects a changeset ID, e.g., with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3846
-\%\fBhg update\fP\:. The creation of a tag is stored in the history and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3847
+\fBhg update\fP. The creation of a tag is stored in the history and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3848
 will thus automatically be shared with other using push and pull.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3849
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3850
 .B Tip
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3851
@@ -5271,7 +5244,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3852
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3853
 The head of a given branch with the highest revision number. When
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3854
 a branch name is used as a revision identifier, it refers to the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3855
-branch tip. See also \(aqBranch, head\(aq. Note that because revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3856
+branch tip. See also 'Branch, head'. Note that because revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3857
 numbers may be different in different repository clones, the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3858
 branch tip may be different in different cloned repositories.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3859
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3860
@@ -5279,22 +5252,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3861
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3862
 (Noun) Another synonym of changeset.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3863
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3864
-Example: "I\(aqve pushed an update".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3865
+Example: "I've pushed an update".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3866
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3867
 (Verb) This term is usually used to describe updating the state of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3868
 the working directory to that of a specific changeset. See
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3869
-\%\fBhg help update\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3870
+\fBhg help update\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3871
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3872
 Example: "You should update".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3873
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3874
 .B Working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3875
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3876
-See \(aqDirectory, working\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3877
+See 'Directory, working'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3878
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3879
 .B Working directory parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3880
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3881
-See \(aqParent, working directory\(aq.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3882
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3883
+See 'Parent, working directory'.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3884
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3885
 .SH SYNTAX FOR MERCURIAL IGNORE FILES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3886
 .SS Synopsis
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3887
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3888
@@ -5321,16 +5294,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3889
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3890
 In addition, a Mercurial configuration file can reference a set of
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3891
 per\-user or global ignore files. See the \fBignore\fP configuration
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3892
-key on the \fB[ui]\fP section of \%\fBhg help config\fP\: for details of how to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3893
+key on the \fB[ui]\fP section of \fBhg help config\fP for details of how to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3894
 configure these files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3895
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3896
-To control Mercurial\(aqs handling of files that it manages, many
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3897
+To control Mercurial's handling of files that it manages, many
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3898
 commands support the \fB\-I\fP and \fB\-X\fP options; see
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3899
-\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3900
+\fBhg help <command>\fP and \fBhg help patterns\fP for details.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3901
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3902
 Files that are already tracked are not affected by .hgignore, even
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3903
 if they appear in .hgignore. An untracked file X can be explicitly
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3904
-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3905
+added with \fBhg add X\fP, even if X would be excluded by a pattern
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3906
 in .hgignore.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3907
 .SS Syntax
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3908
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3909
@@ -5345,13 +5318,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3910
 To change the syntax used, use a line of the following form:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3911
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3912
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3913
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3914
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3915
 syntax: NAME
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3916
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3917
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3918
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3919
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3920
 where \fBNAME\fP is one of the following:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3921
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3922
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3923
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3924
 .B \fBregexp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3925
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3926
@@ -5360,7 +5333,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3927
 .B \fBglob\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3928
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3929
 Shell\-style glob.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3930
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3931
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3932
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3933
 The chosen syntax stays in effect when parsing all patterns that
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3934
 follow, until another syntax is selected.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3935
@@ -5372,7 +5345,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3936
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3937
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3938
 Patterns specified in other than \fB.hgignore\fP are always rooted.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3939
-Please see \%\fBhg help patterns\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3940
+Please see \fBhg help patterns\fP for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3941
 .RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3942
 .SS Example
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3943
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3944
@@ -5379,7 +5352,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3945
 Here is an example ignore file.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3946
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3947
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3948
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3949
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3950
 # use glob syntax.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3951
 syntax: glob
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3952
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3953
@@ -5390,21 +5363,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3954
 # switch to regexp syntax.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3955
 syntax: regexp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3956
 ^\e.pc/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3957
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3958
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3959
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3960
 .SH CONFIGURING HGWEB
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3961
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3962
-Mercurial\(aqs internal web server, hgweb, can serve either a single
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3963
+Mercurial's internal web server, hgweb, can serve either a single
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3964
 repository, or a tree of repositories. In the second case, repository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3965
 paths and global options can be defined using a dedicated
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3966
-configuration file common to \%\fBhg serve\fP\:, \fBhgweb.wsgi\fP,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3967
+configuration file common to \fBhg serve\fP, \fBhgweb.wsgi\fP,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3968
 \fBhgweb.cgi\fP and \fBhgweb.fcgi\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3969
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3970
 This file uses the same syntax as other Mercurial configuration files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3971
 but recognizes only the following sections:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3972
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3973
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3974
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3975
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3976
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3977
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3978
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3979
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3980
 web
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3981
@@ -5414,11 +5387,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3982
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3983
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3984
 collections
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3985
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3986
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3987
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3988
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3989
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3990
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3991
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3992
-The \fBweb\fP options are thoroughly described in \%\fBhg help config\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3993
+The \fBweb\fP options are thoroughly described in \fBhg help config\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3994
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3995
 The \fBpaths\fP section maps URL paths to paths of repositories in the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3996
 filesystem. hgweb will not expose the filesystem directly \- only
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3997
@@ -5433,7 +5406,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3998
 path ends with \fB*\fP or \fB**\fP the filesystem will be searched
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3999
 recursively for repositories below that point.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4000
 With \fB*\fP it will not recurse into the repositories it finds (except for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4001
-\fB.hg/patches\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4002
+\fB\&.hg/patches\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4003
 With \fB**\fP it will also search inside repository working directories
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4004
 and possibly find subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4005
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4006
@@ -5440,15 +5413,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4007
 In this example:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4008
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4009
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4010
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4011
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4012
 [paths]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4013
 /projects/a = /srv/tmprepos/a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4014
 /projects/b = c:/repos/b
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4015
 / = /srv/repos/*
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4016
 /user/bob = /home/bob/repos/**
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4017
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4018
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4019
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4020
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4021
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4022
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4023
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4024
 The first two entries make two repositories in different directories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4025
@@ -5462,7 +5435,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4026
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4027
 The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4028
 and \fBhttp://server/user/bob/quux/testsubrepo/\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4029
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4030
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4031
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4032
 The \fBcollections\fP section is deprecated and has been superseded by
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4033
 \fBpaths\fP.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4034
@@ -5475,8 +5448,8 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4035
 ancestor of the two file versions, so they can determine the changes
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4036
 made on both branches.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4037
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4038
-Merge tools are used both for \%\fBhg resolve\fP\:, \%\fBhg merge\fP\:, \%\fBhg update\fP\:,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4039
-\%\fBhg backout\fP\: and in several extensions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4040
+Merge tools are used both for \fBhg resolve\fP, \fBhg merge\fP, \fBhg update\fP,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4041
+\fBhg backout\fP and in several extensions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4042
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4043
 Usually, the merge tool tries to automatically reconcile the files by
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4044
 combining all non\-overlapping changes that occurred separately in
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4045
@@ -5501,7 +5474,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4046
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4047
 There are some internal merge tools which can be used. The internal
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4048
 merge tools are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4049
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4050
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4051
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4052
 .B \fBinternal:dump\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4053
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4054
@@ -5536,7 +5509,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4055
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4056
 Asks the user which of the local or the other version to keep as
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4057
 the merged version.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4058
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4059
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4060
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4061
 Internal tools are always available and do not require a GUI but will by default
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4062
 not handle symlinks or binary files.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4063
@@ -5543,7 +5516,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4064
 .SS Choosing a merge tool
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4065
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4066
 Mercurial uses these rules when deciding which merge tool to use:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4067
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4068
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4069
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4070
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4071
 If a tool has been specified with the \-\-tool option to merge or resolve, it
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4072
@@ -5580,11 +5553,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4073
 .IP 8. 3
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4074
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4075
 The merge of the file fails and must be resolved before commit.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4076
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4077
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4078
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4079
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4080
 After selecting a merge program, Mercurial will by default attempt
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4081
-to merge the files using a simple merge algorithm first. Only if it doesn\(aqt
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4082
+to merge the files using a simple merge algorithm first. Only if it doesn't
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4083
 succeed because of conflicting changes Mercurial will actually execute the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4084
 merge program. Whether to use the simple merge algorithm first can be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4085
 controlled by the premerge setting of the merge tool. Premerge is enabled by
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4086
@@ -5620,7 +5593,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4087
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4088
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4089
 Patterns specified in \fB.hgignore\fP are not rooted.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4090
-Please see \%\fBhg help hgignore\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4091
+Please see \fBhg help hgignore\fP for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4092
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4093
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4094
 To use a plain path name without any pattern matching, start it with
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4095
@@ -5649,17 +5622,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4096
 Plain examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4097
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4098
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4099
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4100
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4101
 path:foo/bar   a name bar in a directory named foo in the root
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4102
                of the repository
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4103
 path:path:name a file or directory named "path:name"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4104
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4105
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4106
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4107
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4108
 Glob examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4109
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4110
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4111
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4112
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4113
 glob:*.c       any name ending in ".c" in the current directory
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4114
 *.c            any name ending in ".c" in the current directory
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4115
 **.c           any name ending in ".c" in any subdirectory of the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4116
@@ -5667,27 +5640,27 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4117
 foo/*.c        any name ending in ".c" in the directory foo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4118
 foo/**.c       any name ending in ".c" in any subdirectory of foo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4119
                including itself.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4120
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4121
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4122
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4123
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4124
 Regexp examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4125
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4126
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4127
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4128
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4129
 re:.*\e.c$      any name ending in ".c", anywhere in the repository
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4130
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4131
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4132
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4133
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4134
 File examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4135
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4136
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4137
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4138
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4139
 listfile:list.txt  read list from list.txt with one file pattern per line
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4140
 listfile0:list.txt read list from list.txt with null byte delimiters
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4141
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4142
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4143
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4144
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4145
-See also \%\fBhg help filesets\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4146
+See also \fBhg help filesets\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4147
 .SH WORKING WITH PHASES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4148
 .SS What are phases?
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4149
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4150
@@ -5696,9 +5669,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4151
 (for instance, with the mq or rebase extensions).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4152
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4153
 Each changeset in a repository is in one of the following phases:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4154
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4155
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4156
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4157
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4158
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4159
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4160
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4161
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4162
 public : changeset is visible on a public server
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4163
@@ -5708,9 +5681,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4164
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4165
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4166
 secret : changeset should not be pushed, pulled, or cloned
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4167
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4168
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4169
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4170
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4171
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4172
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4173
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4174
 These phases are ordered (public < draft < secret) and no changeset
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4175
 can be in a lower phase than its ancestors. For instance, if a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4176
@@ -5724,14 +5697,14 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4177
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4178
 Once changesets become public, extensions like mq and rebase will
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4179
 refuse to operate on them to prevent creating duplicate changesets.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4180
-Phases can also be manually manipulated with the \%\fBhg phase\fP\: command
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4181
-if needed. See \%\fBhg help \-v phase\fP\: for examples.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4182
+Phases can also be manually manipulated with the \fBhg phase\fP command
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4183
+if needed. See \fBhg help \-v phase\fP for examples.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4184
 .SS Phases and servers
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4185
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4186
 Normally, all servers are \fBpublishing\fP by default. This means:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4187
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4188
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4189
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4190
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4191
 \- all draft changesets that are pulled or cloned appear in phase
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4192
 public on the client
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4193
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4194
@@ -5739,7 +5712,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4195
 client and server
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4196
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4197
 \- secret changesets are neither pushed, pulled, or cloned
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4198
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4199
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4200
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4201
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4202
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4203
@@ -5752,13 +5725,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4204
 repository to disable publishing in its configuration file:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4205
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4206
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4207
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4208
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4209
 [phases]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4210
 publish = False
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4211
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4212
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4213
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4214
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4215
-See \%\fBhg help config\fP\: for more information on configuration files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4216
+See \fBhg help config\fP for more information on configuration files.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4217
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4218
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4219
 Servers running older versions of Mercurial are treated as
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4220
@@ -5772,17 +5745,17 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4221
 of the secret changeset may be communicated to the server.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4222
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4223
 .SS Examples
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4224
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4225
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4226
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4227
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4228
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4229
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4230
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4231
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4232
 list changesets in draft or secret phase:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4233
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4234
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4235
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4236
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4237
 hg log \-r "not public()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4238
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4239
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4240
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4241
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4242
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4243
@@ -5789,9 +5762,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4244
 change all secret changesets to draft:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4245
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4246
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4247
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4248
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4249
 hg phase \-\-draft "secret()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4250
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4251
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4252
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4253
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4254
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4255
@@ -5798,9 +5771,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4256
 forcibly move the current changeset and descendants from public to draft:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4257
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4258
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4259
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4260
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4261
 hg phase \-\-force \-\-draft .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4262
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4263
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4264
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4265
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4266
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4267
@@ -5807,9 +5780,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4268
 show a list of changeset revision and phase:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4269
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4270
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4271
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4272
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4273
 hg log \-\-template "{rev} {phase}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4274
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4275
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4276
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4277
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4278
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4279
@@ -5816,15 +5789,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4280
 resynchronize draft changesets relative to a remote repository:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4281
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4282
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4283
-.ft C
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4284
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4285
 hg phase \-fd "outgoing(URL)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4286
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4287
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4288
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4289
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4290
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4291
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4292
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4293
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4294
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4295
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4296
-See \%\fBhg help phase\fP\: for more information on manually manipulating phases.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4297
+See \fBhg help phase\fP for more information on manually manipulating phases.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4298
 .SH SPECIFYING SINGLE REVISIONS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4299
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4300
 Mercurial supports several ways to specify individual revisions.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4301
@@ -5870,18 +5843,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4302
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4303
 Special characters can be used in quoted identifiers by escaping them,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4304
 e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4305
-interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4306
+interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4307
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4308
 There is a single prefix operator:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4309
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4310
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4311
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4312
 .B \fBnot x\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4313
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4314
 Changesets not in x. Short form is \fB! x\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4315
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4316
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4317
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4318
 These are the supported infix operators:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4319
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4320
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4321
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4322
 .B \fBx::y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4323
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4324
@@ -5920,18 +5893,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4325
 .B \fBx~n\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4326
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4327
 The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4328
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4329
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4330
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4331
 There is a single postfix operator:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4332
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4333
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4334
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4335
 .B \fBx^\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4336
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4337
 Equivalent to \fBx^1\fP, the first parent of each changeset in x.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4338
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4339
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4340
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4341
 The following predicates are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4342
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4343
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4344
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4345
 .B \fBadds(pattern)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4346
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4347
@@ -5964,7 +5937,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4348
 .B \fBbisect(string)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4349
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4350
 Changesets marked in the specified bisect status:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4351
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4352
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4353
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4354
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4355
 \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4356
@@ -5986,7 +5959,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4357
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4358
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4359
 \fBcurrent\fP            : the cset currently being bisected
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4360
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4361
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4362
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4363
 .B \fBbookmark([name])\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4364
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4365
@@ -6031,8 +6004,8 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4366
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4367
 .B \fBcontains(pattern)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4368
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4369
-The revision\(aqs manifest contains a file matching pattern (but might not
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4370
-modify it). See \%\fBhg help patterns\fP\: for information about file patterns.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4371
+The revision's manifest contains a file matching pattern (but might not
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4372
+modify it). See \fBhg help patterns\fP for information about file patterns.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4373
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4374
 The pattern without explicit kind like \fBglob:\fP is expected to be
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4375
 relative to the current directory and match against a file exactly
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4376
@@ -6045,7 +6018,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4377
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4378
 .B \fBdate(interval)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4379
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4380
-Changesets within the interval, see \%\fBhg help dates\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4381
+Changesets within the interval, see \fBhg help dates\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4382
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4383
 .B \fBdesc(string)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4384
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4385
@@ -6097,7 +6070,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4386
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4387
 For performance reasons, visits only revisions mentioned in the file\-level
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4388
 filelog, rather than filtering through all changesets (much faster, but
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4389
-doesn\(aqt include deletes or duplicate changes). For a slower, more accurate
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4390
+doesn't include deletes or duplicate changes). For a slower, more accurate
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4391
 result, use \fBfile()\fP.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4392
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4393
 The pattern without explicit kind like \fBglob:\fP is expected to be
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4394
@@ -6110,13 +6083,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4395
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4396
 .B \fBfollow([file])\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4397
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4398
-An alias for \fB::.\fP (ancestors of the working copy\(aqs first parent).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4399
+An alias for \fB::.\fP (ancestors of the working copy's first parent).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4400
 If a filename is specified, the history of the given file is followed,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4401
 including copies.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4402
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4403
 .B \fBgrep(regex)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4404
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4405
-Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r\(aq...\(aq)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4406
+Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r'...')\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4407
 to ensure special escape characters are handled correctly. Unlike
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4408
 \fBkeyword(string)\fP, the match is case\-sensitive.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4409
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4410
@@ -6232,7 +6205,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4411
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4412
 .B \fBpresent(set)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4413
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4414
-An empty set, if any revision in set isn\(aqt found; otherwise,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4415
+An empty set, if any revision in set isn't found; otherwise,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4416
 all revisions in set.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4417
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4418
 If any of specified revisions is not present in the local repository,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4419
@@ -6246,7 +6219,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4420
 .B \fBremote([id [,path]])\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4421
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4422
 Local revision that corresponds to the given identifier in a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4423
-remote repository, if present. Here, the \(aq.\(aq identifier is a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4424
+remote repository, if present. Here, the '.' identifier is a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4425
 synonym for the current local branch.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4426
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4427
 .B \fBremoves(pattern)\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4428
@@ -6279,7 +6252,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4429
 as \fB\-key\fP to sort in descending order.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4430
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4431
 The keys can be:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4432
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4433
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4434
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4435
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4436
 \fBrev\fP for the revision number,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4437
@@ -6295,7 +6268,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4438
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4439
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4440
 \fBdate\fP for the commit date
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4441
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4442
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4443
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4444
 .B \fBtag([name])\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4445
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4446
@@ -6316,15 +6289,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4447
 If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4448
 a regular expression. To match a user that actually contains \fIre:\fP, use
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4449
 the prefix \fIliteral:\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4450
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4451
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4452
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4453
 New predicates (known as "aliases") can be defined, using any combination of
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4454
 existing predicates or other aliases. An alias definition looks like:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4455
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4456
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4457
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4458
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4459
 <alias> = <definition>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4460
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4461
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4462
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4463
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4464
 in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4465
@@ -6334,21 +6307,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4466
 For example,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4467
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4468
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4469
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4470
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4471
 [revsetalias]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4472
 h = heads()
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4473
 d($1) = sort($1, date)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4474
 rs($1, $2) = reverse(sort($1, $2))
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4475
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4476
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4477
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4478
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4479
 defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4480
 exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4481
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4482
-Command line equivalents for \%\fBhg log\fP\::
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4483
+Command line equivalents for \fBhg log\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4484
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4485
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4486
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4487
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4488
 \-f    \->  ::.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4489
 \-d x  \->  date(x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4490
 \-k x  \->  keyword(x)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4491
@@ -6357,19 +6330,19 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4492
 \-b x  \->  branch(x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4493
 \-P x  \->  !::x
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4494
 \-l x  \->  limit(expr, x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4495
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4496
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4497
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4498
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4499
 Some sample queries:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4500
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4501
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4502
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4503
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4504
 Changesets on the default branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4505
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4506
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4507
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4508
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4509
 hg log \-r "branch(default)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4510
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4511
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4512
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4513
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4514
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4515
@@ -6376,9 +6349,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4516
 Changesets on the default branch since tag 1.5 (excluding merges):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4517
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4518
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4519
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4520
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4521
 hg log \-r "branch(default) and 1.5:: and not merge()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4522
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4523
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4524
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4525
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4526
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4527
@@ -6385,9 +6358,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4528
 Open branch heads:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4529
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4530
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4531
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4532
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4533
 hg log \-r "head() and not closed()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4534
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4535
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4536
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4537
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4538
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4539
@@ -6395,9 +6368,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4540
 \fBhgext/*\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4541
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4542
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4543
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4544
-hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4545
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4546
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4547
+hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4548
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4549
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4550
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4551
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4552
@@ -6404,9 +6377,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4553
 Changesets committed in May 2008, sorted by user:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4554
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4555
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4556
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4557
-hg log \-r "sort(date(\(aqMay 2008\(aq), user)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4558
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4559
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4560
+hg log \-r "sort(date('May 2008'), user)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4561
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4562
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4563
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4564
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4565
@@ -6414,11 +6387,11 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4566
 release:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4567
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4568
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4569
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4570
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4571
 hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4572
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4573
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4574
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4575
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4576
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4577
 .SH SUBREPOSITORIES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4578
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4579
 Subrepositories let you nest external repositories or projects into a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4580
@@ -6429,7 +6402,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4581
 subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4582
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4583
 Subrepositories are made of three components:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4584
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4585
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4586
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4587
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4588
 Nested repository checkouts. They can appear anywhere in the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4589
@@ -6442,18 +6415,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4590
 subrepositories are referenced like:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4591
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4592
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4593
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4594
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4595
 path/to/nested = https://example.com/nested/repo/path
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4596
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4597
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4598
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4599
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4600
 Git and Subversion subrepos are also supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4601
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4602
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4603
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4604
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4605
 path/to/nested = [git]git://example.com/nested/repo/path
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4606
 path/to/nested = [svn]https://example.com/nested/trunk/path
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4607
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4608
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4609
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4610
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4611
 where \fBpath/to/nested\fP is the checkout location relatively to the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4612
@@ -6476,7 +6449,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4613
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4614
 The \fB.hgsubstate\fP file should not be edited manually.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4615
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4616
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4617
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4618
 .SS Adding a Subrepository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4619
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4620
 If \fB.hgsub\fP does not exist, create it and add it to the parent
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4621
@@ -6484,7 +6457,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4622
 to live in the parent repository. Edit \fB.hgsub\fP and add the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4623
 subrepository entry as described above. At this point, the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4624
 subrepository is tracked and the next commit will record its state in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4625
-\fB.hgsubstate\fP and bind it to the committed changeset.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4626
+\fB\&.hgsubstate\fP and bind it to the committed changeset.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4627
 .SS Synchronizing a Subrepository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4628
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4629
 Subrepos do not automatically track the latest changeset of their
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4630
@@ -6501,7 +6474,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4631
 To remove a subrepository from the parent repository, delete its
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4632
 reference from \fB.hgsub\fP, then remove its files.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4633
 .SS Interaction with Mercurial Commands
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4634
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4635
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4636
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4637
 .B add
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4638
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4639
@@ -6528,7 +6501,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4640
 have been modified, Mercurial will abort.  Mercurial can be made
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4641
 to instead commit all modified subrepositories by specifying
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4642
 \-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4643
-configuration file (see \%\fBhg help config\fP\:).  After there are no
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4644
+configuration file (see \fBhg help config\fP).  After there are no
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4645
 longer any modified subrepositories, it records their state and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4646
 finally commits it in the parent repository.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4647
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4648
@@ -6559,7 +6532,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4649
 .B pull
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4650
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4651
 pull is not recursive since it is not clear what to pull prior
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4652
-to running \%\fBhg update\fP\:. Listing and retrieving all
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4653
+to running \fBhg update\fP. Listing and retrieving all
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4654
 subrepositories changes referenced by the parent repository pulled
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4655
 changesets is expensive at best, impossible in the Subversion
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4656
 case.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4657
@@ -6586,7 +6559,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4658
 changeset is not available in the current subrepository, Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4659
 will pull it in first before updating.  This means that updating
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4660
 can require network access when using subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4661
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4662
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4663
 .SS Remapping Subrepositories Sources
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4664
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4665
 A subrepository source location may change during a project life,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4666
@@ -6610,9 +6583,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4667
 Usage:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4668
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4669
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4670
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4671
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4672
 $ hg log \-r1 \-\-style changelog
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4673
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4674
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4675
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4676
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4677
 A template is a piece of text, with markup to invoke variable
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4678
@@ -6619,16 +6592,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4679
 expansion:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4680
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4681
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4682
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4683
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4684
 $ hg log \-r1 \-\-template "{node}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4685
 b56ce7b07c52de7d5fd79fb89701ea538af65746
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4686
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4687
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4688
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4689
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4690
 Strings in curly braces are called keywords. The availability of
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4691
 keywords depends on the exact context of the templater. These
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4692
 keywords are usually available for templating a log\-like command:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4693
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4694
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4695
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4696
 .B author
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4697
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4698
@@ -6667,7 +6640,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4699
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4700
 .B extras
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4701
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4702
-List of dicts with key, value entries of the \(aqextras\(aq
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4703
+List of dicts with key, value entries of the 'extras'
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4704
 field of this changeset.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4705
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4706
 .B file_adds
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4707
@@ -6713,24 +6686,24 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4708
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4709
 .B p1node
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4710
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4711
-String. The identification hash of the changeset\(aqs first parent,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4712
+String. The identification hash of the changeset's first parent,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4713
 as a 40 digit hexadecimal string. If the changeset has no parents, all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4714
 digits are 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4715
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4716
 .B p1rev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4717
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4718
-Integer. The repository\-local revision number of the changeset\(aqs
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4719
+Integer. The repository\-local revision number of the changeset's
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4720
 first parent, or \-1 if the changeset has no parents.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4721
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4722
 .B p2node
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4723
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4724
-String. The identification hash of the changeset\(aqs second
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4725
+String. The identification hash of the changeset's second
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4726
 parent, as a 40 digit hexadecimal string. If the changeset has no second
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4727
 parent, all digits are 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4728
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4729
 .B p2rev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4730
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4731
-Integer. The repository\-local revision number of the changeset\(aqs
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4732
+Integer. The repository\-local revision number of the changeset's
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4733
 second parent, or \-1 if the changeset has no second parent.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4734
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4735
 .B parents
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4736
@@ -6754,24 +6727,24 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4737
 .B tags
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4738
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4739
 List of strings. Any tags associated with the changeset.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4740
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4741
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4742
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4743
 The "date" keyword does not produce human\-readable output. If you
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4744
 want to use a date in your output, you can use a filter to process
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4745
 it. Filters are functions which return a string based on the input
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4746
-variable. Be sure to use the stringify filter first when you\(aqre
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4747
+variable. Be sure to use the stringify filter first when you're
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4748
 applying a string\-input filter to a list\-like input variable.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4749
 You can also use a chain of filters to get the desired output:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4750
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4751
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4752
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4753
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4754
 $ hg tip \-\-template "{date|isodate}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4755
 2008\-08\-21 18:22 +0000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4756
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4757
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4758
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4759
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4760
 List of filters:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4761
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4762
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4763
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4764
 .B addbreaks
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4765
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4766
@@ -6855,7 +6828,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4767
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4768
 .B nonempty
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4769
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4770
-Any text. Returns \(aq(none)\(aq if the string is empty.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4771
+Any text. Returns '(none)' if the string is empty.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4772
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4773
 .B obfuscate
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4774
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4775
@@ -6921,13 +6894,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4776
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4777
 Any text. Returns a short representation of a user name or email
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4778
 address.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4779
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4780
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4781
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4782
 Note that a filter is nothing more than a function call, i.e.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4783
 \fBexpr|filter\fP is equivalent to \fBfilter(expr)\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4784
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4785
 In addition to filters, there are some basic built\-in functions:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4786
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4787
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4788
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4789
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4790
 date(date[, fmt])
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4791
@@ -6967,25 +6940,25 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4792
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4793
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4794
 sub(pat, repl, expr)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4795
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4796
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4797
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4798
 Also, for any expression that returns a list, there is a list operator:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4799
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4800
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4801
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4802
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4803
 expr % "{template}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4804
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4805
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4806
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4807
 Some sample command line templates:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4808
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4809
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4810
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4811
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4812
 Format lists, e.g. files:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4813
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4814
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4815
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4816
-$ hg log \-r 0 \-\-template "files:\en{files % \(aq  {file}\en\(aq}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4817
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4818
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4819
+$ hg log \-r 0 \-\-template "files:\en{files % '  {file}\en'}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4820
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4821
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4822
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4823
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4824
@@ -6992,9 +6965,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4825
 Join the list of files with a ", ":
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4826
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4827
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4828
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4829
-$ hg log \-r 0 \-\-template "files: {join(files, \(aq, \(aq)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4830
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4831
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4832
+$ hg log \-r 0 \-\-template "files: {join(files, ', ')}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4833
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4834
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4835
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4836
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4837
@@ -7001,9 +6974,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4838
 Format date:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4839
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4840
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4841
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4842
-$ hg log \-r 0 \-\-template "{date(date, \(aq%Y\(aq)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4843
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4844
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4845
+$ hg log \-r 0 \-\-template "{date(date, '%Y')}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4846
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4847
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4848
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4849
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4850
@@ -7010,9 +6983,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4851
 Output the description set to a fill\-width of 30:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4852
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4853
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4854
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4855
-$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4856
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4857
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4858
+$ hg log \-r 0 \-\-template "{fill(desc, '30')}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4859
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4860
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4861
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4862
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4863
@@ -7019,10 +6992,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4864
 Use a conditional to test for the default branch:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4865
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4866
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4867
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4868
-$ hg log \-r 0 \-\-template "{ifeq(branch, \(aqdefault\(aq, \(aqon the main branch\(aq,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4869
-\(aqon branch {branch}\(aq)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4870
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4871
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4872
+$ hg log \-r 0 \-\-template "{ifeq(branch, 'default', 'on the main branch',
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4873
+\&'on branch {branch}')}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4874
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4875
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4876
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4877
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4878
@@ -7029,9 +7002,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4879
 Append a newline if not empty:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4880
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4881
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4882
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4883
-$ hg tip \-\-template "{if(author, \(aq{author}\en\(aq)}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4884
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4885
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4886
+$ hg tip \-\-template "{if(author, '{author}\en')}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4887
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4888
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4889
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4890
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4891
@@ -7038,9 +7011,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4892
 Label the output for use with the color extension:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4893
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4894
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4895
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4896
-$ hg log \-r 0 \-\-template "{label(\(aqchangeset.{phase}\(aq, node|short)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4897
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4898
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4899
+$ hg log \-r 0 \-\-template "{label('changeset.{phase}', node|short)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4900
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4901
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4902
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4903
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4904
@@ -7047,61 +7020,61 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4905
 Invert the firstline filter, i.e. everything but the first line:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4906
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4907
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4908
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4909
-$ hg log \-r 0 \-\-template "{sub(r\(aq^.*\en?\en?\(aq, \(aq\(aq, desc)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4910
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4911
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4912
+$ hg log \-r 0 \-\-template "{sub(r'^.*\en?\en?', '', desc)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4913
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4914
 .fi
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4915
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4916
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4917
-Display the contents of the \(aqextra\(aq field, one per line:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4918
+Display the contents of the 'extra' field, one per line:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4919
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4920
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4921
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4922
-$ hg log \-r 0 \-\-template "{join(extras, \(aq\en\(aq)}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4923
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4924
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4925
+$ hg log \-r 0 \-\-template "{join(extras, '\en')}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4926
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4927
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4928
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4929
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4930
-Mark the current bookmark with \(aq*\(aq:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4931
+Mark the current bookmark with '*':
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4932
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4933
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4934
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4935
-$ hg log \-\-template "{bookmarks % \(aq{bookmark}{ifeq(bookmark, current, \e"*\e")} \(aq}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4936
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4937
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4938
+$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, current, \e"*\e")} '}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4939
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4940
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4941
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4942
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4943
-Mark the working copy parent with \(aq@\(aq:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4944
+Mark the working copy parent with '@':
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4945
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4946
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4947
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4948
-$ hg log \-\-template "{ifcontains(rev, revset(\(aq.\(aq), \(aq@\(aq)}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4949
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4950
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4951
+$ hg log \-\-template "{ifcontains(rev, revset('.'), '@')}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4952
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4953
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4954
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4955
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4956
 .SH URL PATHS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4957
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4958
 Valid URLs are of the form:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4959
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4960
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4961
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4962
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4963
 local/filesystem/path[#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4964
 file://local/filesystem/path[#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4965
 http://[user[:pass]@]host[:port]/[path][#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4966
 https://[user[:pass]@]host[:port]/[path][#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4967
 ssh://[user@]host[:port]/[path][#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4968
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4969
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4970
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4971
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4972
 Paths in the local filesystem can either point to Mercurial
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4973
-repositories or to bundle files (as created by \%\fBhg bundle\fP\: or
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4974
-\%\fBhg incoming \-\-bundle\fP\:). See also \%\fBhg help paths\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4975
+repositories or to bundle files (as created by \fBhg bundle\fP or
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4976
+\fBhg incoming \-\-bundle\fP). See also \fBhg help paths\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4977
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4978
 An optional identifier after # indicates a particular branch, tag, or
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4979
-changeset to use from the remote repository. See also \%\fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4980
-revisions\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4981
+changeset to use from the remote repository. See also \fBhg help
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4982
+revisions\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4983
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4984
-Some features, such as pushing to \%http://\: and \%https://\: URLs are only
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4985
+Some features, such as pushing to http:// and https:// URLs are only
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4986
 possible if the feature is explicitly enabled on the remote Mercurial
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4987
 server.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4988
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4989
@@ -7109,7 +7082,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4990
 web.cacerts.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4991
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4992
 Some notes about using SSH with Mercurial:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4993
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4994
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4995
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4996
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4997
 SSH requires an accessible shell account on the destination machine
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  4998
@@ -7116,63 +7089,63 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4999
 and a copy of hg in the remote path or specified with as remotecmd.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5000
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5001
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5002
-path is relative to the remote user\(aqs home directory by default. Use
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5003
+path is relative to the remote user's home directory by default. Use
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5004
 an extra slash at the start of a path to specify an absolute path:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5005
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5006
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5007
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5008
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5009
 ssh://example.com//tmp/repository
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5010
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5011
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5012
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5013
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5014
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5015
-Mercurial doesn\(aqt use its own compression via SSH; the right thing
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5016
+Mercurial doesn't use its own compression via SSH; the right thing
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5017
 to do is to configure it in your ~/.ssh/config, e.g.:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5018
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5019
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5020
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5021
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5022
 Host *.mylocalnetwork.example.com
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5023
   Compression no
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5024
 Host *
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5025
   Compression yes
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5026
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5027
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5028
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5029
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5030
 Alternatively specify "ssh \-C" as your ssh command in your
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5031
 configuration file or with the \-\-ssh command line option.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5032
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5033
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5034
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5035
 These URLs can all be stored in your configuration file with path
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5036
 aliases under the [paths] section like so:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5037
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5038
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5039
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5040
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5041
 [paths]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5042
 alias1 = URL1
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5043
 alias2 = URL2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5044
 \&...
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5045
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5046
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5047
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5048
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5049
 You can then use the alias for any command that uses a URL (for
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5050
-example \%\fBhg pull alias1\fP\: will be treated as \%\fBhg pull URL1\fP\:).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5051
+example \fBhg pull alias1\fP will be treated as \fBhg pull URL1\fP).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5052
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5053
 Two path aliases are special because they are used as defaults when
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5054
 you do not provide the URL to a command:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5055
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5056
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5057
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5058
 .B default:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5059
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5060
 When you create a repository with hg clone, the clone command saves
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5061
-the location of the source repository as the new repository\(aqs
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5062
-\(aqdefault\(aq path. This is then used when you omit path from push\- and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5063
+the location of the source repository as the new repository's
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5064
+\&'default' path. This is then used when you omit path from push\- and
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5065
 pull\-like commands (including incoming and outgoing).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5066
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5067
 .B default\-push:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5068
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5069
-The push command will look for a path named \(aqdefault\-push\(aq, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5070
-prefer it over \(aqdefault\(aq if both are defined.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5071
-.UNINDENT
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5072
+The push command will look for a path named 'default\-push', and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5073
+prefer it over 'default' if both are defined.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5074
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5075
 .SH EXTENSIONS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5076
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5077
 This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5078
@@ -7196,7 +7169,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5079
 distinguish them.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5080
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5081
 The order in which access checks are performed is:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5082
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5083
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5084
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5085
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5086
 Deny  list for branches (section \fBacl.deny.branches\fP)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5087
@@ -7209,7 +7182,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5088
 .IP 4. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5089
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5090
 Allow list for paths    (section \fBacl.allow\fP)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5091
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5092
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5093
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5094
 The allow and deny sections take key\-value pairs.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5095
 .SS Branch\-based Access Control
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5096
@@ -7217,7 +7190,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5097
 Use the \fBacl.deny.branches\fP and \fBacl.allow.branches\fP sections to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5098
 have branch\-based access control. Keys in these sections can be
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5099
 either:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5100
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5101
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5102
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5103
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5104
 a branch name, or
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5105
@@ -7224,10 +7197,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5106
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5107
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5108
 an asterisk, to match any branch;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5109
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5110
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5111
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5112
 The corresponding values can be either:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5113
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5114
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5115
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5116
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5117
 a comma\-separated list containing users and groups, or
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5118
@@ -7234,7 +7207,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5119
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5120
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5121
 an asterisk, to match anyone;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5122
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5123
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5124
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5125
 You can add the "!" prefix to a user or group name to invert the sense
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5126
 of the match.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5127
@@ -7256,7 +7229,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5128
 .SS Example Configuration
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5129
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5130
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5131
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5132
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5133
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5134
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5135
 # Use this if you want to check access restrictions at commit time
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5136
@@ -7332,12 +7305,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5137
 src/main/resources/** = *
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5138
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5139
 \&.hgtags = release_engineer
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5140
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5141
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5142
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5143
 .SS Examples using the "!" prefix
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5144
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5145
-Suppose there\(aqs a branch that only a given user (or group) should be able to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5146
-push to, and you don\(aqt want to restrict access to any other branch that may
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5147
+Suppose there's a branch that only a given user (or group) should be able to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5148
+push to, and you don't want to restrict access to any other branch that may
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5149
 be created.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5150
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5151
 The "!" prefix allows you to prevent anyone except a given user or group to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5152
@@ -7349,18 +7322,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5153
 3) Deny access to a file to anyone but user "gollum"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5154
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5155
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5156
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5157
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5158
 [acl.allow.branches]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5159
 # Empty
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5160
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5161
 [acl.deny.branches]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5162
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5163
-# 1) only \(aqgollum\(aq can commit to branch \(aqring\(aq;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5164
-# \(aqgollum\(aq and anyone else can still commit to any other branch.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5165
+# 1) only 'gollum' can commit to branch 'ring';
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5166
+# 'gollum' and anyone else can still commit to any other branch.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5167
 ring = !gollum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5168
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5169
-# 2) only members of the group \(aqhobbit\(aq can commit to branch \(aqlake\(aq;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5170
-# \(aqhobbit\(aq members and anyone else can still commit to any other branch.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5171
+# 2) only members of the group 'hobbit' can commit to branch 'lake';
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5172
+# 'hobbit' members and anyone else can still commit to any other branch.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5173
 lake = !@hobbit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5174
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5175
 # You can also deny access based on file paths:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5176
@@ -7369,10 +7342,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5177
 # Empty
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5178
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5179
 [acl.deny]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5180
-# 3) only \(aqgollum\(aq can change the file below;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5181
-# \(aqgollum\(aq and anyone else can still change any other file.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5182
+# 3) only 'gollum' can change the file below;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5183
+# 'gollum' and anyone else can still change any other file.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5184
 /misty/mountains/cave/ring = !gollum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5185
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5186
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5187
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5188
 .SS blackbox
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5189
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5190
@@ -7383,7 +7356,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5191
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5192
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5193
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5194
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5195
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5196
 [blackbox]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5197
 track = *
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5198
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5199
@@ -7398,7 +7371,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5200
 maxsize = 1.5 MB
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5201
 # rotate up to N log files when the current one gets too big
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5202
 maxfiles = 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5203
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5204
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5205
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5206
 .SS Commands
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5207
 .SS blackbox
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5208
@@ -7406,20 +7379,20 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5209
 view the recent repository events:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5210
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5211
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5212
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5213
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5214
 hg blackbox [OPTION]...
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5215
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5216
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5217
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5218
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5219
 view the recent repository events
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5220
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5221
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5222
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5223
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5224
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5225
 .BI \-l,  \-\-limit \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5226
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5227
 the number of events to show (default: 10)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5228
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5229
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5230
 .SS bugzilla
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5231
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5232
 hooks for integrating with the Bugzilla bug tracker
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5233
@@ -7432,7 +7405,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5234
 hours spent working on the bug. Bugs can also be marked fixed.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5235
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5236
 Three basic modes of access to Bugzilla are provided:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5237
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5238
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5239
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5240
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5241
 Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5242
@@ -7444,7 +7417,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5243
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5244
 Writing directly to the Bugzilla database. Only Bugzilla installations
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5245
 using MySQL are supported. Requires Python MySQLdb.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5246
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5247
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5248
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5249
 Writing directly to the database is susceptible to schema changes, and
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5250
 relies on a Bugzilla contrib script to send out bug change
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5251
@@ -7472,12 +7445,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5252
 works on all supported Bugzilla versions.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5253
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5254
 Configuration items common to all access modes:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5255
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5256
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5257
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5258
 .B bugzilla.version
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5259
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5260
 The access type to use. Values recognized are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5261
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5262
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5263
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5264
 .B \fBxmlrpc\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5265
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5266
@@ -7500,7 +7473,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5267
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5268
 MySQL access, Bugzilla 2.16 and up to but not
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5269
 including 2.18.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5270
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5271
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5272
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5273
 .B bugzilla.regexp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5274
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5275
@@ -7545,7 +7518,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5276
 Template to use when formatting comments. Overrides style if
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5277
 specified. In addition to the usual Mercurial keywords, the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5278
 extension specifies:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5279
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5280
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5281
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5282
 .B \fB{bug}\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5283
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5284
@@ -7562,7 +7535,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5285
 .B \fB{hgweb}\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5286
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5287
 Base URL for browsing Mercurial repositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5288
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5289
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5290
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5291
 Default \fBchangeset {node|short} in repo {root} refers to bug
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5292
 {bug}.\endetails:\en\et{desc|tabindent}\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5293
@@ -7579,10 +7552,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5294
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5295
 Base URL for browsing Mercurial repositories. Referenced from
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5296
 templates as \fB{hgweb}\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5297
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5298
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5299
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5300
 Configuration items common to XMLRPC+email and MySQL access modes:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5301
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5302
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5303
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5304
 .B bugzilla.usermap
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5305
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5306
@@ -7591,13 +7564,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5307
 line:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5308
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5309
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5310
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5311
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5312
 committer = Bugzilla user
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5313
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5314
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5315
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5316
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5317
 See also the \fB[usermap]\fP section.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5318
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5319
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5320
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5321
 The \fB[usermap]\fP section is used to specify mappings of Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5322
 committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5323
@@ -7604,7 +7577,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5324
 Contains entries of the form \fBcommitter = Bugzilla user\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5325
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5326
 XMLRPC access mode configuration:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5327
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5328
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5329
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5330
 .B bugzilla.bzurl
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5331
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5332
@@ -7619,22 +7592,22 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5333
 .B bugzilla.password
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5334
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5335
 The password for Bugzilla login.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5336
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5337
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5338
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5339
 XMLRPC+email access mode uses the XMLRPC access mode configuration items,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5340
 and also:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5341
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5342
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5343
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5344
 .B bugzilla.bzemail
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5345
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5346
 The Bugzilla email address.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5347
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5348
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5349
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5350
 In addition, the Mercurial email settings must be configured. See the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5351
 documentation in hgrc(5), sections \fB[email]\fP and \fB[smtp]\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5352
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5353
 MySQL access mode configuration:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5354
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5355
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5356
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5357
 .B bugzilla.host
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5358
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5359
@@ -7674,12 +7647,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5360
 id) and \fBuser\fP (committer bugzilla email). Default depends on
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5361
 version; from 2.18 it is "cd %(bzdir)s && perl \-T
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5362
 contrib/sendbugmail.pl %(id)s %(user)s".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5363
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5364
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5365
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5366
 Activating the extension:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5367
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5368
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5369
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5370
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5371
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5372
 bugzilla =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5373
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5374
@@ -7686,7 +7659,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5375
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5376
 # run bugzilla hook on every change pulled or pushed in here
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5377
 incoming.bugzilla = python:hgext.bugzilla.hook
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5378
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5379
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5380
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5381
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5382
 Example configurations:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5383
@@ -7698,7 +7671,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5384
 with a web interface at \fBhttp://my\-project.org/hg\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5385
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5386
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5387
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5388
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5389
 [bugzilla]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5390
 bzurl=http://my\-project.org/bugzilla
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5391
 user=bugmail@my\-project.org
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5392
@@ -7711,7 +7684,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5393
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5394
 [web]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5395
 baseurl=http://my\-project.org/hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5396
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5397
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5398
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5399
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5400
 XMLRPC+email example configuration. This uses the Bugzilla at
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5401
@@ -7723,7 +7696,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5402
 \fBbugzilla@my\-project.org\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5403
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5404
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5405
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5406
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5407
 [bugzilla]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5408
 bzurl=http://my\-project.org/bugzilla
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5409
 user=bugmail@my\-project.org
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5410
@@ -7740,7 +7713,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5411
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5412
 [usermap]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5413
 [email protected][email protected]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5414
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5415
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5416
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5417
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5418
 MySQL example configuration. This has a local Bugzilla 3.2 installation
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5419
@@ -7751,7 +7724,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5420
 with a web interface at \fBhttp://my\-project.org/hg\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5421
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5422
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5423
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5424
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5425
 [bugzilla]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5426
 host=localhost
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5427
 password=XYZZY
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5428
@@ -7768,25 +7741,25 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5429
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5430
 [usermap]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5431
 [email protected][email protected]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5432
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5433
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5434
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5435
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5436
 All the above add a comment to the Bugzilla bug record of the form:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5437
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5438
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5439
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5440
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5441
 Changeset 3b16791d6642 in repository\-name.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5442
 http://my\-project.org/hg/repository\-name/rev/3b16791d6642
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5443
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5444
 Changeset commit comment. Bug 1234.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5445
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5446
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5447
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5448
 .SS children
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5449
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5450
 command to display child changesets (DEPRECATED)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5451
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5452
-This extension is deprecated. You should use \%\fBhg log \-r
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5453
-"children(REV)"\fP\: instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5454
+This extension is deprecated. You should use \fBhg log \-r
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5455
+"children(REV)"\fP instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5456
 .SS Commands
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5457
 .SS children
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5458
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5459
@@ -7793,12 +7766,12 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5460
 show the children of the given or working directory revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5461
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5462
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5463
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5464
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5465
 hg children [\-r REV] [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5466
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5467
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5468
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5469
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5470
-Print the children of the working directory\(aqs revisions. If a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5471
+Print the children of the working directory's revisions. If a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5472
 revision is given via \-r/\-\-rev, the children of that revision will
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5473
 be printed. If a file argument is given, revision in which the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5474
 file was last changed (after the working directory revision or the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5475
@@ -7805,7 +7778,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5476
 argument to \-\-rev if given) is printed.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5477
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5478
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5479
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5480
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5481
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5482
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5483
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5484
@@ -7818,7 +7791,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5485
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5486
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5487
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5488
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5489
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5490
 .SS churn
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5491
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5492
 command to display statistics about repository history
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5493
@@ -7828,9 +7801,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5494
 histogram of changes to the repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5495
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5496
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5497
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5498
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5499
 hg churn [\-d DATE] [\-r REV] [\-\-aliases FILE] [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5500
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5501
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5502
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5503
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5504
 This command will display a histogram representing the number
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5505
@@ -7846,7 +7819,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5506
 Examples:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5507
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5508
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5509
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5510
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5511
 # display count of changed lines for every committer
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5512
 hg churn \-t "{author|email}"
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5513
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5514
@@ -7858,7 +7831,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5515
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5516
 # display count of lines changed in every year
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5517
 hg churn \-f "%Y" \-s
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5518
-.ft P
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5519
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5520
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5521
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5522
 It is possible to map alternate email addresses to a main address
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5523
@@ -7865,9 +7838,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5524
 by providing a file using the following format:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5525
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5526
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5527
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5528
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5529
 <alias email> = <actual email>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5530
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5531
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5532
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5533
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5534
 Such a file may be specified with the \-\-aliases option, otherwise
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5535
@@ -7875,7 +7848,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5536
 Aliases will be split from the rightmost "=".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5537
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5538
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5539
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5540
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5541
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5542
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5543
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5544
@@ -7916,7 +7889,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5545
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5546
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5547
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5548
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5549
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5550
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5551
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5552
 .SS color
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5553
@@ -7938,7 +7911,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5554
 Default effects may be overridden from your configuration file:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5555
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5556
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5557
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5558
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5559
 [color]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5560
 status.modified = blue bold underline red_background
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5561
 status.added = green bold
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5562
@@ -7947,7 +7920,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5563
 status.unknown = magenta bold underline
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5564
 status.ignored = black bold
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5565
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5566
-# \(aqnone\(aq turns off all effects
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5567
+# 'none' turns off all effects
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5568
 status.clean = none
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5569
 status.copied = none
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5570
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5571
@@ -7986,13 +7959,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5572
 shelve.name = blue bold
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5573
 
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5574
 histedit.remaining = red bold
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5575
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5576
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5577
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5578
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5579
-The available effects in terminfo mode are \(aqblink\(aq, \(aqbold\(aq, \(aqdim\(aq,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5580
-\(aqinverse\(aq, \(aqinvisible\(aq, \(aqitalic\(aq, \(aqstandout\(aq, and \(aqunderline\(aq; in
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5581
-ECMA\-48 mode, the options are \(aqbold\(aq, \(aqinverse\(aq, \(aqitalic\(aq, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5582
-\(aqunderline\(aq.  How each is rendered depends on the terminal emulator.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5583
+The available effects in terminfo mode are 'blink', 'bold', 'dim',
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5584
+\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5585
+ECMA\-48 mode, the options are 'bold', 'inverse', 'italic', and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5586
+\&'underline'.  How each is rendered depends on the terminal emulator.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5587
 Some may not be available for a given terminal type, and will be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5588
 silently ignored.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5589
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5590
@@ -7999,7 +7972,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5591
 Note that on some systems, terminfo mode may cause problems when using
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5592
 color with the pager extension and less \-R. less with the \-R option
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5593
 will only display ECMA\-48 color codes, and terminfo mode may sometimes
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5594
-emit codes that less doesn\(aqt understand. You can work around this by
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5595
+emit codes that less doesn't understand. You can work around this by
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5596
 either using ansi mode (or auto mode), or by using less \-r (which will
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5597
 pass through all terminal control codes, not just color control
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5598
 codes).
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5599
@@ -8009,18 +7982,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5600
 for your terminal type, assuming terminfo mode.  For instance:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5601
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5602
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5603
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5604
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5605
 color.brightblue = 12
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5606
 color.pink = 207
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5607
 color.orange = 202
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5608
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5609
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5610
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5611
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5612
-to set \(aqbrightblue\(aq to color slot 12 (useful for 16 color terminals
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5613
-that have brighter colors defined in the upper eight) and, \(aqpink\(aq and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5614
-\(aqorange\(aq to colors in 256\-color xterm\(aqs default color cube.  These
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5615
+to set 'brightblue' to color slot 12 (useful for 16 color terminals
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5616
+that have brighter colors defined in the upper eight) and, 'pink' and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5617
+\&'orange' to colors in 256\-color xterm's default color cube.  These
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5618
 defined colors may then be used as any of the pre\-defined eight,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5619
-including appending \(aq_background\(aq to set the background to that color.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5620
+including appending '_background' to set the background to that color.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5621
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5622
 By default, the color extension will use ANSI mode (or win32 mode on
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5623
 Windows) if it detects a terminal. To override auto mode (to enable
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5624
@@ -8027,13 +8000,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5625
 terminfo mode, for example), set the following configuration option:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5626
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5627
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5628
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5629
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5630
 [color]
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5631
 mode = terminfo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5632
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5633
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5634
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5635
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5636
-Any value other than \(aqansi\(aq, \(aqwin32\(aq, \(aqterminfo\(aq, or \(aqauto\(aq will
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5637
+Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5638
 disable color.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5639
 .SS Commands
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5640
 .SS convert
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5641
@@ -8045,13 +8018,13 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5642
 convert a foreign SCM repository to a Mercurial one.:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5643
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5644
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5645
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5646
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5647
 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5648
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5649
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5650
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5651
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5652
 Accepted source formats [identifiers]:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5653
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5654
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5655
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5656
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5657
 Mercurial [hg]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5658
@@ -8079,10 +8052,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5659
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5660
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5661
 Perforce [p4]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5662
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5663
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5664
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5665
 Accepted destination formats [identifiers]:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5666
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5667
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5668
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5669
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5670
 Mercurial [hg]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5671
@@ -8089,7 +8062,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5672
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5673
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5674
 Subversion [svn] (history on branches is not preserved)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5675
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5676
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5677
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5678
 If no revision is given, all revisions will be converted.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5679
 Otherwise, convert will only import up to the named revision
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5680
@@ -8097,12 +8070,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5681
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5682
 If no destination directory name is specified, it defaults to the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5683
 basename of the source with \fB\-hg\fP appended. If the destination
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5684
-repository doesn\(aqt exist, it will be created.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5685
+repository doesn't exist, it will be created.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5686
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5687
 By default, all sources except Mercurial will use \-\-branchsort.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5688
 Mercurial uses \-\-sourcesort to preserve original revision numbers
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5689
 order. Sort modes have the following effects:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5690
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5691
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5692
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5693
 .B \-\-branchsort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5694
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5695
@@ -8127,21 +8100,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5696
 try to move closed revisions as close as possible
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5697
 to parent branches, only supported by Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5698
 sources.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5699
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5700
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5701
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5702
-If \fBREVMAP\fP isn\(aqt given, it will be put in a default location
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5703
+If \fBREVMAP\fP isn't given, it will be put in a default location
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5704
 (\fB<dest>/.hg/shamap\fP by default). The \fBREVMAP\fP is a simple
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5705
 text file that maps each source commit ID to the destination ID
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5706
 for that revision, like so:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5707
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5708
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5709
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5710
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5711
 <source ID> <destination ID>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5712
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5713
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5714
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5715
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5716
-If the file doesn\(aqt exist, it\(aqs automatically created. It\(aqs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5717
-updated on each commit copied, so \%\fBhg convert\fP\: can be interrupted
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5718
+If the file doesn't exist, it's automatically created. It's
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5719
+updated on each commit copied, so \fBhg convert\fP can be interrupted
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5720
 and can be run repeatedly to copy new commits.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5721
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5722
 The authormap is a simple text file that maps each source commit
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5723
@@ -8150,9 +8123,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5724
 author mapping and the line format is:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5725
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5726
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5727
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5728
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5729
 source author = destination author
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5730
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5731
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5732
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5733
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5734
 Empty lines and lines starting with a \fB#\fP are ignored.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5735
@@ -8162,13 +8135,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5736
 directives:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5737
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5738
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5739
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5740
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5741
 include path/to/file\-or\-dir
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5742
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5743
 exclude path/to/file\-or\-dir
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5744
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5745
 rename path/to/source path/to/destination
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5746
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5747
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5748
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5749
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5750
 Comment lines start with \fB#\fP. A specified path matches if it
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5751
@@ -8193,9 +8166,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5752
 comma\-separated values:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5753
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5754
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5755
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5756
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5757
 key parent1, parent2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5758
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5759
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5760
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5761
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5762
 The key is the revision ID in the source
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5763
@@ -8215,9 +8188,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5764
 lines of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5765
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5766
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5767
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5768
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5769
 original_branch_name new_branch_name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5770
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5771
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5772
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5773
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5774
 where "original_branch_name" is the name of the branch in the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5775
@@ -8229,7 +8202,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5776
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5777
 The Mercurial source recognizes the following configuration
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5778
 options, which you can set on the command line with \fB\-\-config\fP:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5779
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5780
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5781
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5782
 .B convert.hg.ignoreerrors
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5783
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5784
@@ -8246,7 +8219,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5785
 .B convert.hg.revs
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5786
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5787
 revset specifying the source revisions to convert.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5788
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5789
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5790
 .SS CVS Source
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5791
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5792
 CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5793
@@ -8260,7 +8233,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5794
 sandbox is ignored.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5795
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5796
 The following options can be used with \fB\-\-config\fP:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5797
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5798
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5799
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5800
 .B convert.cvsps.cache
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5801
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5802
@@ -8311,7 +8284,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5803
 the changesets are calculated from the CVS log. The
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5804
 function is passed a list with the changeset entries, and can
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5805
 modify the changesets in\-place, or add or delete them.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5806
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5807
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5808
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5809
 An additional "debugcvsps" Mercurial command allows the builtin
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5810
 changeset merging code to be run without doing a conversion. Its
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5811
@@ -8331,7 +8304,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5812
 detection.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5813
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5814
 The following options can be set with \fB\-\-config\fP:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5815
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5816
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5817
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5818
 .B convert.svn.branches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5819
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5820
@@ -8353,18 +8326,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5821
 use local time (as determined by the TZ
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5822
 environment variable) for changeset date/times. The default
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5823
 is False (use UTC).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5824
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5825
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5826
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5827
 Source history can be retrieved starting at a specific revision,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5828
 instead of being integrally converted. Only single branch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5829
 conversions are supported.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5830
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5831
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5832
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5833
 .B convert.svn.startrev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5834
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5835
 specify start Subversion revision number.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5836
 The default is 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5837
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5838
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5839
 .SS Perforce Source
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5840
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5841
 The Perforce (P4) importer can be given a p4 depot path or a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5842
@@ -8376,17 +8349,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5843
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5844
 It is possible to limit the amount of source history to be
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5845
 converted by specifying an initial Perforce revision:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5846
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5847
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5848
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5849
 .B convert.p4.startrev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5850
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5851
 specify initial Perforce revision (a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5852
 Perforce changelist number).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5853
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5854
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5855
 .SS Mercurial Destination
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5856
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5857
 The following options are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5858
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5859
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5860
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5861
 .B convert.hg.clonebranches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5862
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5863
@@ -8402,10 +8375,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5864
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5865
 preserve branch names. The default is
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5866
 True.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5867
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5868
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5869
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5870
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5871
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5872
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5873
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5874
 .BI \-\-authors \ <FILE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5875
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5876
@@ -8454,7 +8427,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5877
 .B \-\-closesort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5878
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5879
 try to reorder closed revisions
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5880
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5881
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5882
 .SS eol
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5883
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5884
 automatically manage newlines in repository files
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5885
@@ -8466,7 +8439,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5886
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5887
 The extension reads its configuration from a versioned \fB.hgeol\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5888
 configuration file found in the root of the working copy. The
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5889
-\fB.hgeol\fP file use the same syntax as all other Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5890
+\fB\&.hgeol\fP file use the same syntax as all other Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5891
 configuration files. It uses two sections, \fB[patterns]\fP and
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5892
 \fB[repository]\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5893
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5894
@@ -8479,9 +8452,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5895
 Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5896
 checked out and stored in the repository in that format and files
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5897
 declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5898
-\fBnative\fP is an alias for checking out in the platform\(aqs default line
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5899
+\fBnative\fP is an alias for checking out in the platform's default line
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5900
 ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5901
-Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5902
+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5903
 default behaviour; it is only needed if you need to override a later,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5904
 more general pattern.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5905
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5906
@@ -8498,7 +8471,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5907
 Example versioned \fB.hgeol\fP file:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5908
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5909
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5910
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5911
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5912
 [patterns]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5913
 **.py = native
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5914
 **.vcproj = CRLF
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5915
@@ -8508,7 +8481,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5916
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5917
 [repository]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5918
 native = LF
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5919
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5920
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5921
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5922
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5923
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5924
@@ -8520,12 +8493,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5925
 normal Mercurial configuration files and the \fB.hgeol\fP file, with the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5926
 latter overriding the former. You can use that section to control the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5927
 overall behavior. There are three settings:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5928
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5929
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5930
 .IP \(bu 2
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5931
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5932
 \fBeol.native\fP (default \fBos.linesep\fP) can be set to \fBLF\fP or
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5933
 \fBCRLF\fP to override the default interpretation of \fBnative\fP for
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5934
-checkout. This can be used with \%\fBhg archive\fP\: on Unix, say, to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5935
+checkout. This can be used with \fBhg archive\fP on Unix, say, to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5936
 generate an archive where files have line endings for Windows.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5937
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5938
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5939
@@ -8539,7 +8512,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5940
 \fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5941
 ensure that converted files end with a EOL character (either \fB\en\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5942
 or \fB\er\en\fP as per the configured patterns).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5943
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5944
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5945
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5946
 The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5947
 like the deprecated win32text extension does. This means that you can
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5948
@@ -8555,7 +8528,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5949
 \fBeol.checkallhook\fP hook. These hooks are best used as
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5950
 \fBpretxnchangegroup\fP hooks.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5951
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5952
-See \%\fBhg help patterns\fP\: for more information about the glob patterns
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5953
+See \fBhg help patterns\fP for more information about the glob patterns
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5954
 used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5955
 .SS extdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5956
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5957
@@ -8568,12 +8541,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5958
 files to compare.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5959
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5960
 The extdiff extension also allows you to configure new diff commands, so
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5961
-you do not need to type \%\fBhg extdiff \-p kdiff3\fP\: always.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5962
+you do not need to type \fBhg extdiff \-p kdiff3\fP always.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5963
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5964
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5965
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5966
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5967
 [extdiff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5968
-# add new command that runs GNU diff(1) in \(aqcontext diff\(aq mode
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5969
+# add new command that runs GNU diff(1) in 'context diff' mode
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5970
 cdiff = gdiff \-Nprc5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5971
 ## or the old way:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5972
 #cmd.cdiff = gdiff
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5973
@@ -8590,20 +8563,20 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5974
 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5975
 # your .vimrc
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5976
 vimdiff = gvim \-f "+next" \e
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5977
-          "+execute \(aqDirDiff\(aq fnameescape(argv(0)) fnameescape(argv(1))"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5978
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5979
+          "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5980
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5981
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5982
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5983
 Tool arguments can include variables that are expanded at runtime:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5984
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5985
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5986
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5987
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5988
 $parent1, $plabel1 \- filename, descriptive label of first parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5989
 $child,   $clabel  \- filename, descriptive label of child revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5990
 $parent2, $plabel2 \- filename, descriptive label of second parent
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5991
 $root              \- repository root
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5992
 $parent is an alias for $parent1.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5993
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5994
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5995
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5996
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5997
 The extdiff extension will look in your [diff\-tools] and [merge\-tools]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5998
@@ -8610,17 +8583,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  5999
 sections for diff tool arguments, when none are specified in [extdiff].
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6000
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6001
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6002
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6003
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6004
 [extdiff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6005
 kdiff3 =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6006
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6007
 [diff\-tools]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6008
-kdiff3.diffargs=\-\-L1 \(aq$plabel1\(aq \-\-L2 \(aq$clabel\(aq $parent $child
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6009
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6010
+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6011
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6012
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6013
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6014
 You can use \-I/\-X and list of file or directory names like normal
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6015
-\%\fBhg diff\fP\: command. The extdiff extension makes snapshots of only
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6016
+\fBhg diff\fP command. The extdiff extension makes snapshots of only
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6017
 needed files, so running the external diff program will actually be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6018
 pretty fast (at least faster than having to compare the entire tree).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6019
 .SS Commands
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6020
@@ -8629,9 +8602,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6021
 use external program to diff repository (or selected files):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6022
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6023
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6024
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6025
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6026
 hg extdiff [OPT]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6027
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6028
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6029
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6030
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6031
 Show differences between revisions for the specified files, using
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6032
@@ -8650,7 +8623,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6033
 to its parent.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6034
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6035
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6036
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6037
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6038
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6039
 .BI \-p,  \-\-program \ <CMD>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6040
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6041
@@ -8675,7 +8648,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6042
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6043
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6044
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6045
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6046
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6047
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6048
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6049
 .SS factotum
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6050
@@ -8691,9 +8664,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6051
 By default, keys are specified as:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6052
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6053
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6054
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6055
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6056
 proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6057
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6058
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6059
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6060
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6061
 If the factotum extension is unable to read the required key, one will be
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6062
@@ -8703,12 +8676,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6063
 default, these entries are:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6064
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6065
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6066
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6067
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6068
 [factotum]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6069
 executable = /bin/auth/factotum
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6070
 mountpoint = /mnt/factotum
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6071
 service = hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6072
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6073
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6074
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6075
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6076
 The executable entry defines the full path to the factotum binary. The
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6077
@@ -8723,9 +8696,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6078
 pull changes from a remote repository, merge new changes if needed.:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6079
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6080
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6081
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6082
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6083
 hg fetch [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6084
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6085
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6086
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6087
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6088
 This finds all changes from the repository at the specified path
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6089
@@ -8740,12 +8713,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6090
 the newly pulled changes. Local changes are then merged into the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6091
 pulled changes. To switch the merge order, use \-\-switch\-parent.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6092
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6093
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6094
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6095
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6096
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6097
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6098
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6099
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6100
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6101
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6102
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6103
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6104
@@ -8790,7 +8763,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6105
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6106
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6107
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6108
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6109
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6110
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6111
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6112
 .SS gpg
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6113
@@ -8802,9 +8775,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6114
 verify all the signatures there may be for a particular revision:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6115
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6116
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6117
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6118
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6119
 hg sigcheck REV
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6120
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6121
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6122
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6123
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6124
 verify all the signatures there may be for a particular revision
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6125
@@ -8813,18 +8786,18 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6126
 add a signature for the current or given revision:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6127
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6128
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6129
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6130
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6131
 hg sign [OPTION]... [REV]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6132
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6133
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6134
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6135
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6136
 If no revision is given, the parent of the working directory is used,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6137
 or tip if no revision is checked out.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6138
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6139
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6140
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6141
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6142
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6143
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6144
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6145
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6146
 .B \-l,  \-\-local
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6147
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6148
@@ -8853,15 +8826,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6149
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6150
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6151
 record the specified user as committer
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6152
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6153
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6154
 .SS sigs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6155
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6156
 list signed changesets:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6157
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6158
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6159
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6160
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6161
 hg sigs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6162
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6163
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6164
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6165
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6166
 list signed changesets
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6167
@@ -8881,9 +8854,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6168
 show revision history alongside an ASCII revision graph:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6169
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6170
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6171
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6172
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6173
 hg glog [OPTION]... [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6174
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6175
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6176
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6177
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6178
 Print a revision history alongside a revision graph drawn with
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6179
@@ -8893,7 +8866,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6180
 directory.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6181
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6182
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6183
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6184
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6185
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6186
 .B \-f,  \-\-follow
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6187
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6188
@@ -8982,7 +8955,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6189
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6190
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6191
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6192
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6193
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6194
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6195
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6196
 .SS hgcia
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6197
@@ -8993,7 +8966,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6198
 configure it, set the following options in your hgrc:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6199
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6200
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6201
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6202
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6203
 [cia]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6204
 # your registered CIA user name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6205
 user = foo
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6206
@@ -9025,7 +8998,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6207
 [web]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6208
 # If you want hyperlinks (optional)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6209
 baseurl = http://server/path/to/repo
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6210
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6211
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6212
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6213
 .SS hgk
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6214
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6215
@@ -9037,19 +9010,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6216
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6217
 hgk consists of two parts: a Tcl script that does the displaying and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6218
 querying of information, and an extension to Mercurial named hgk.py,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6219
-which provides hooks for hgk to get information. hgk can be found in
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6220
-the contrib directory, and the extension is shipped in the hgext
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6221
-repository, and needs to be enabled.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6222
+which provides hooks for hgk to get information.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6223
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6224
-The \%\fBhg view\fP\: command will launch the hgk Tcl script. For this command
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6225
-to work, hgk must be in your search path. Alternately, you can specify
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6226
-the path to hgk in your configuration file:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6227
+The \fBhg view\fP command will launch the hgk Tcl script. The script is
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6228
+shipped in /usr/demo/mercurial, and hgk needs no configuration to find
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6229
+it.  You can specify the path to an alternate hgk in your configuration
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6230
+file:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6231
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6232
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6233
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6234
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6235
 [hgk]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6236
 path=/location/of/hgk
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6237
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6238
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6239
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6240
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6241
 hgk can make use of the extdiff extension to visualize revisions.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6242
@@ -9056,10 +9028,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6243
 Assuming you had already configured extdiff vdiff command, just add:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6244
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6245
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6246
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6247
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6248
 [hgk]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6249
 vdiff=vdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6250
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6251
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6252
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6253
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6254
 Revisions context menu will now display additional entries to fire
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6255
@@ -9070,37 +9042,37 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6256
 start interactive history viewer:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6257
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6258
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6259
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6260
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6261
 hg view [\-l LIMIT] [REVRANGE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6262
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6263
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6264
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6265
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6266
 start interactive history viewer
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6267
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6268
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6269
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6270
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6271
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6272
 .BI \-l,  \-\-limit \ <NUM>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6273
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6274
 limit number of changes displayed
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6275
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6276
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6277
 .SS highlight
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6278
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6279
 syntax highlighting for hgweb (requires Pygments)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6280
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6281
 It depends on the Pygments syntax highlighting library:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6282
-\%http://pygments.org/\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6283
+http://pygments.org/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6284
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6285
 There is a single configuration option:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6286
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6287
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6288
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6289
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6290
 [web]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6291
 pygments_style = <style>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6292
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6293
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6294
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6295
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6296
-The default is \(aqcolorful\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6297
+The default is 'colorful'.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6298
 .SS histedit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6299
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6300
 interactive history editing
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6301
@@ -9109,7 +9081,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6302
 is as follows, assuming the following history:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6303
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6304
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6305
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6306
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6307
 @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6308
 |    Add delta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6309
 |
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6310
@@ -9121,7 +9093,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6311
 |
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6312
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6313
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6314
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6315
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6316
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6317
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6318
 If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6319
@@ -9128,7 +9100,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6320
 file open in your editor:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6321
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6322
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6323
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6324
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6325
 pick c561b4e977df Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6326
 pick 030b686bedc4 Add gamma
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6327
 pick 7c2fd3b9020c Add delta
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6328
@@ -9144,7 +9116,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6329
 #  d, drop = remove commit from history
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6330
 #  m, mess = edit message without changing commit content
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6331
 #
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6332
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6333
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6334
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6335
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6336
 In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6337
@@ -9153,7 +9125,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6338
 would reorganize the file to look like this:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6339
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6340
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6341
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6342
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6343
 pick 030b686bedc4 Add gamma
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6344
 pick c561b4e977df Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6345
 fold 7c2fd3b9020c Add delta
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6346
@@ -9169,7 +9141,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6347
 #  d, drop = remove commit from history
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6348
 #  m, mess = edit message without changing commit content
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6349
 #
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6350
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6351
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6352
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6353
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6354
 At which point you close the editor and \fBhistedit\fP starts working. When you
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6355
@@ -9177,21 +9149,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6356
 those revisions together, offering you a chance to clean up the commit message:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6357
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6358
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6359
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6360
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6361
 Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6362
 ***
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6363
 Add delta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6364
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6365
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6366
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6367
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6368
 Edit the commit message to your liking, then close the editor. For
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6369
-this example, let\(aqs assume that the commit message was changed to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6370
+this example, let's assume that the commit message was changed to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6371
 \fBAdd beta and delta.\fP After histedit has run and had a chance to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6372
 remove any old or temporary revisions it needed, the history looks
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6373
 like this:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6374
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6375
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6376
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6377
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6378
 @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6379
 |    Add beta and delta.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6380
 |
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6381
@@ -9200,12 +9172,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6382
 |
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6383
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6384
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6385
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6386
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6387
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6388
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6389
 Note that \fBhistedit\fP does \fInot\fP remove any revisions (even its own temporary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6390
 ones) until after it has completed all the editing operations, so it will
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6391
-probably perform several strip operations when it\(aqs done. For the above example,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6392
+probably perform several strip operations when it's done. For the above example,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6393
 it had to run strip twice. Strip can be slow depending on a variety of factors,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6394
 so you might need to be a little patient. You can choose to keep the original
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6395
 revisions by passing the \fB\-\-keep\fP flag.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6396
@@ -9212,20 +9184,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6397
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6398
 The \fBedit\fP operation will drop you back to a command prompt,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6399
 allowing you to edit files freely, or even use \fBhg record\fP to commit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6400
-some changes as a separate commit. When you\(aqre done, any remaining
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6401
+some changes as a separate commit. When you're done, any remaining
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6402
 uncommitted changes will be committed as well. When done, run \fBhg
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6403
-histedit \-\-continue\fP to finish this step. You\(aqll be prompted for a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6404
+histedit \-\-continue\fP to finish this step. You'll be prompted for a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6405
 new commit message, but the default commit message will be the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6406
 original message for the \fBedit\fP ed revision.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6407
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6408
 The \fBmessage\fP operation will give you a chance to revise a commit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6409
-message without changing the contents. It\(aqs a shortcut for doing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6410
+message without changing the contents. It's a shortcut for doing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6411
 \fBedit\fP immediately followed by \fIhg histedit \-\-continue\(ga\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6412
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6413
 If \fBhistedit\fP encounters a conflict when moving a revision (while
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6414
-handling \fBpick\fP or \fBfold\fP), it\(aqll stop in a similar manner to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6415
-\fBedit\fP with the difference that it won\(aqt prompt you for a commit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6416
-message when done. If you decide at this point that you don\(aqt like how
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6417
+handling \fBpick\fP or \fBfold\fP), it'll stop in a similar manner to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6418
+\fBedit\fP with the difference that it won't prompt you for a commit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6419
+message when done. If you decide at this point that you don't like how
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6420
 much work it will be to rearrange history, or that you made a mistake,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6421
 you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6422
 have made and return to the state before you attempted to edit your
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6423
@@ -9235,7 +9207,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6424
 changes, such that we have the following history:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6425
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6426
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6427
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6428
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6429
 @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6430
 |    Add theta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6431
 |
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6432
@@ -9256,7 +9228,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6433
 |
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6434
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6435
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6436
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6437
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6438
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6439
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6440
 If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6441
@@ -9269,9 +9241,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6442
 interactively edit changeset history:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6443
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6444
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6445
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6446
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6447
 hg histedit ANCESTOR | \-\-outgoing [URL]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6448
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6449
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6450
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6451
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6452
 This command edits changesets between ANCESTOR and the parent of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6453
@@ -9279,7 +9251,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6454
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6455
 With \-\-outgoing, this edits changesets not found in the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6456
 destination repository. If URL of the destination is omitted, the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6457
-\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6458
+\&'default\-push' (or 'default') path will be used.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6459
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6460
 For safety, this command is aborted, also if there are ambiguous
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6461
 outgoing revisions which may confuse users: for example, there are
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6462
@@ -9287,7 +9259,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6463
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6464
 Use "min(outgoing() and ::.)" or similar revset specification
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6465
 instead of \-\-outgoing to specify edit target revision exactly in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6466
-such ambiguous situation. See \%\fBhg help revsets\fP\: for detail about
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6467
+such ambiguous situation. See \fBhg help revsets\fP for detail about
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6468
 selecting revisions.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6469
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6470
 Returns 0 on success, 1 if user intervention is required (not only
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6471
@@ -9295,7 +9267,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6472
 conflicts).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6473
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6474
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6475
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6476
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6477
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6478
 .BI \-\-commands \ <VALUE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6479
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6480
@@ -9307,7 +9279,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6481
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6482
 .B \-k,  \-\-keep
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6483
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6484
-don\(aqt strip old nodes after edit is complete
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6485
+don't strip old nodes after edit is complete
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6486
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6487
 .B \-\-abort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6488
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6489
@@ -9324,7 +9296,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6490
 .BI \-r,  \-\-rev \ <VALUE[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6491
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6492
 first revision to be edited
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6493
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6494
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6495
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6496
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6497
 .SS keyword
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6498
@@ -9347,7 +9319,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6499
 Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6500
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6501
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6502
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6503
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6504
 [keyword]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6505
 # expand keywords in every python file except those matching "x*"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6506
 **.py =
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6507
@@ -9356,7 +9328,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6508
 [keywordset]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6509
 # prefer svn\- over cvs\-like default keywordmaps
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6510
 svn = True
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6511
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6512
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6513
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6514
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6515
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6516
@@ -9365,11 +9337,11 @@
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  6517
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6518
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6519
 For [keywordmaps] template mapping and expansion demonstration and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6520
-control run \%\fBhg kwdemo\fP\:. See \%\fBhg help templates\fP\: for a list of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6521
+control run \fBhg kwdemo\fP. See \fBhg help templates\fP for a list of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6522
 available templates and filters.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6523
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6524
 Three additional date template filters are provided:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6525
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6526
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6527
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6528
 .B \fButcdate\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6529
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6530
@@ -9382,20 +9354,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6531
 .B \fBsvnisodate\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6532
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6533
 "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6534
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6535
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6536
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6537
-The default template mappings (view with \%\fBhg kwdemo \-d\fP\:) can be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6538
+The default template mappings (view with \fBhg kwdemo \-d\fP) can be
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6539
 replaced with customized keywords and templates. Again, run
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6540
-\%\fBhg kwdemo\fP\: to control the results of your configuration changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6541
+\fBhg kwdemo\fP to control the results of your configuration changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6542
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6543
-Before changing/disabling active keywords, you must run \%\fBhg kwshrink\fP\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6544
+Before changing/disabling active keywords, you must run \fBhg kwshrink\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6545
 to avoid storing expanded keywords in the change history.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6546
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6547
 To force expansion after enabling it, or a configuration change, run
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6548
-\%\fBhg kwexpand\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6549
+\fBhg kwexpand\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6550
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6551
 Expansions spanning more than one line and incremental expansions,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6552
-like CVS\(aq $Log$, are not supported. A keyword template map "Log =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6553
+like CVS' $Log$, are not supported. A keyword template map "Log =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6554
 {desc}" expands to the first line of the changeset description.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6555
 .SS Commands
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6556
 .SS kwdemo
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6557
@@ -9403,9 +9375,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6558
 print [keywordmaps] configuration and an expansion example:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6559
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6560
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6561
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6562
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6563
 hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6564
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6565
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6566
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6567
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6568
 Show current, custom, or default keyword template maps and their
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6569
@@ -9416,10 +9388,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6570
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6571
 Use \-d/\-\-default to disable current configuration.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6572
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6573
-See \%\fBhg help templates\fP\: for information on templates and filters.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6574
+See \fBhg help templates\fP for information on templates and filters.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6575
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6576
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6577
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6578
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6579
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6580
 .B \-d,  \-\-default
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6581
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6582
@@ -9428,15 +9400,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6583
 .BI \-f,  \-\-rcfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6584
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6585
 read maps from rcfile
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6586
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6587
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6588
 .SS kwexpand
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6589
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6590
 expand keywords in the working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6591
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6592
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6593
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6594
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6595
 hg kwexpand [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6596
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6597
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6598
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6599
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6600
 Run after (re)enabling keyword expansion.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6601
@@ -9444,7 +9416,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6602
 kwexpand refuses to run if given files contain local changes.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6603
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6604
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6605
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6606
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6607
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6608
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6609
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6610
@@ -9453,7 +9425,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6611
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6612
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6613
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6614
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6615
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6616
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6617
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6618
 .SS kwfiles
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6619
@@ -9461,9 +9433,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6620
 show files configured for keyword expansion:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6621
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6622
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6623
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6624
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6625
 hg kwfiles [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6626
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6627
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6628
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6629
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6630
 List which files in the working directory are matched by the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6631
@@ -9473,7 +9445,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6632
 execution by including only files that are actual candidates for
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6633
 expansion.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6634
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6635
-See \%\fBhg help keyword\fP\: on how to construct patterns both for
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6636
+See \fBhg help keyword\fP on how to construct patterns both for
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6637
 inclusion and exclusion of files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6638
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6639
 With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6640
@@ -9480,16 +9452,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6641
 of files are:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6642
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6643
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6644
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6645
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6646
 K = keyword expansion candidate
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6647
 k = keyword expansion candidate (not tracked)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6648
 I = ignored
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6649
 i = ignored (not tracked)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6650
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6651
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6652
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6653
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6654
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6655
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6656
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6657
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6658
 .B \-A,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6659
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6660
@@ -9510,7 +9482,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6661
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6662
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6663
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6664
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6665
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6666
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6667
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6668
 .SS kwshrink
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6669
@@ -9518,9 +9490,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6670
 revert expanded keywords in the working directory:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6671
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6672
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6673
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6674
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6675
 hg kwshrink [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6676
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6677
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6678
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6679
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6680
 Must be run before changing/disabling active keywords.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6681
@@ -9528,7 +9500,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6682
 kwshrink refuses to run if given files contain local changes.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6683
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6684
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6685
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6686
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6687
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6688
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6689
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6690
@@ -9537,7 +9509,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6691
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6692
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6693
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6694
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6695
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6696
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6697
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6698
 .SS largefiles
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6699
@@ -9546,10 +9518,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6700
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6701
 Large binary files tend to be not very compressible, not very
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6702
 diffable, and not at all mergeable. Such files are not handled
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6703
-efficiently by Mercurial\(aqs storage format (revlog), which is based on
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6704
+efficiently by Mercurial's storage format (revlog), which is based on
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6705
 compressed binary deltas; storing large binary files as regular
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6706
 Mercurial files wastes bandwidth and disk space and increases
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6707
-Mercurial\(aqs memory usage. The largefiles extension addresses these
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6708
+Mercurial's memory usage. The largefiles extension addresses these
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6709
 problems by adding a centralized client\-server layer on top of
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6710
 Mercurial: largefiles live in a \fIcentral store\fP out on the network
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6711
 somewhere, and you only fetch the revisions that you need when you
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6712
@@ -9561,18 +9533,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6713
 identified by the SHA\-1 hash of their contents, which is written to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6714
 the standin. largefiles uses that revision ID to get/put largefile
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6715
 revisions from/to the central store. This saves both disk space and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6716
-bandwidth, since you don\(aqt need to retrieve all historical revisions
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6717
+bandwidth, since you don't need to retrieve all historical revisions
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6718
 of large files when you clone or pull.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6719
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6720
 To start a new repository or add new large binary files, just add
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6721
-\-\-large to your \%\fBhg add\fP\: command. For example:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6722
+\-\-large to your \fBhg add\fP command. For example:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6723
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6724
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6725
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6726
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6727
 $ dd if=/dev/urandom of=randomdata count=2000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6728
 $ hg add \-\-large randomdata
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6729
-$ hg commit \-m \(aqadd randomdata as a largefile\(aq
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6730
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6731
+$ hg commit \-m 'add randomdata as a largefile'
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6732
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6733
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6734
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6735
 When you push a changeset that adds/modifies largefiles to a remote
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6736
@@ -9589,8 +9561,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6737
 copy to the latest pulled revision (and thereby downloading any new
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6738
 largefiles).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6739
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6740
-If you want to pull largefiles you don\(aqt need for update yet, then
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6741
-you can use pull with the \fI\-\-lfrev\fP option or the \%\fBhg lfpull\fP\: command.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6742
+If you want to pull largefiles you don't need for update yet, then
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6743
+you can use pull with the \fI\-\-lfrev\fP option or the \fBhg lfpull\fP command.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6744
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6745
 If you know you are pulling from a non\-default location and want to
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6746
 download all the largefiles that correspond to the new changesets at
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6747
@@ -9609,12 +9581,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6748
 If you already have large files tracked by Mercurial without the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6749
 largefiles extension, you will need to convert your repository in
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6750
 order to benefit from largefiles. This is done with the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6751
-\%\fBhg lfconvert\fP\: command:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6752
+\fBhg lfconvert\fP command:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6753
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6754
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6755
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6756
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6757
 $ hg lfconvert \-\-size 10 oldrepo newrepo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6758
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6759
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6760
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6761
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6762
 In repositories that already have largefiles in them, any new file
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6763
@@ -9624,20 +9596,20 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6764
 \-\-lfsize option to the add command (also in megabytes):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6765
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6766
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6767
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6768
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6769
 [largefiles]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6770
 minsize = 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6771
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6772
 $ hg add \-\-lfsize 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6773
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6774
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6775
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6776
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6777
 The \fBlargefiles.patterns\fP config option allows you to specify a list
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6778
-of filename patterns (see \%\fBhg help patterns\fP\:) that should always be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6779
+of filename patterns (see \fBhg help patterns\fP) that should always be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6780
 tracked as largefiles:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6781
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6782
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6783
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6784
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6785
 [largefiles]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6786
 patterns =
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6787
   *.jpg
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6788
@@ -9644,7 +9616,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6789
   re:.*\e.(png|bmp)$
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6790
   library.zip
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6791
   content/audio/*
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6792
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6793
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6794
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6795
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6796
 Files that match one of these patterns will be added as largefiles
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6797
@@ -9653,7 +9625,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6798
 The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6799
 will be ignored for any repositories not already containing a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6800
 largefile. To add the first largefile to a repository, you must
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6801
-explicitly do so with the \-\-large flag passed to the \%\fBhg add\fP\:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6802
+explicitly do so with the \-\-large flag passed to the \fBhg add\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6803
 command.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6804
 .SS Commands
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6805
 .SS lfconvert
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6806
@@ -9661,9 +9633,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6807
 convert a normal repository to a largefiles repository:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6808
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6809
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6810
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6811
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6812
 hg lfconvert SOURCE DEST [FILE ...]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6813
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6814
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6815
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6816
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6817
 Convert repository SOURCE to a new repository DEST, identical to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6818
@@ -9683,7 +9655,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6819
 this, the DEST repository can be used without largefiles at all.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6820
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6821
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6822
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6823
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6824
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6825
 .BI \-s,  \-\-size \ <SIZE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6826
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6827
@@ -9692,33 +9664,33 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6828
 .B \-\-to\-normal
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6829
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6830
 convert from a largefiles repo to a normal repo
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6831
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6832
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6833
 .SS lfpull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6834
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6835
 pull largefiles for the specified revisions from the specified source:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6836
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6837
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6838
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6839
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6840
 hg lfpull \-r REV... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6841
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6842
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6843
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6844
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6845
 Pull largefiles that are referenced from local changesets but missing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6846
 locally, pulling from a remote repository to the local cache.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6847
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6848
-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6849
-See \%\fBhg help urls\fP\: for more information.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6850
+If SOURCE is omitted, the 'default' path will be used.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6851
+See \fBhg help urls\fP for more information.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6852
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6853
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6854
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6855
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6856
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6857
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6858
 pull largefiles for all branch heads:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6859
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6860
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6861
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6862
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6863
 hg lfpull \-r "head() and not closed()"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6864
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6865
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6866
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6867
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6868
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6869
@@ -9725,14 +9697,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6870
 pull largefiles on the default branch:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6871
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6872
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6873
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6874
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6875
 hg lfpull \-r "branch(default)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6876
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6877
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6878
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6879
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6880
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6881
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6882
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6883
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6884
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6885
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6886
 .BI \-r,  \-\-rev \ <VALUE[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6887
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6888
@@ -9749,7 +9721,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6889
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6890
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6891
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6892
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6893
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6894
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6895
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6896
 .SS mq
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6897
@@ -9763,10 +9735,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6898
 Known patches are represented as patch files in the .hg/patches
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6899
 directory. Applied patches are both patch files and changesets.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6900
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6901
-Common tasks (use \%\fBhg help command\fP\: for more details):
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6902
+Common tasks (use \fBhg help command\fP for more details):
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6903
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6904
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6905
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6906
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6907
 create new patch                          qnew
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6908
 import existing patch                     qimport
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6909
 
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6910
@@ -9776,7 +9748,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6911
 add known patch to applied stack          qpush
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6912
 remove patch from applied stack           qpop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6913
 refresh contents of top applied patch     qrefresh
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6914
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6915
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6916
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6917
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6918
 By default, mq will automatically use git patches when required to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6919
@@ -9784,29 +9756,29 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6920
 files creations or deletions. This behaviour can be configured with:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6921
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6922
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6923
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6924
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6925
 [mq]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6926
 git = auto/keep/yes/no
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6927
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6928
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6929
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6930
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6931
-If set to \(aqkeep\(aq, mq will obey the [diff] section configuration while
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6932
-preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6933
-\(aqno\(aq, mq will override the [diff] section and always generate git or
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6934
+If set to 'keep', mq will obey the [diff] section configuration while
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6935
+preserving existing git patches upon qrefresh. If set to 'yes' or
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6936
+\&'no', mq will override the [diff] section and always generate git or
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6937
 regular patches, possibly losing data in the second case.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6938
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6939
 It may be desirable for mq changesets to be kept in the secret phase (see
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6940
-\%\fBhg help phases\fP\:), which can be enabled with the following setting:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6941
+\fBhg help phases\fP), which can be enabled with the following setting:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6942
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6943
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6944
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6945
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6946
 [mq]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6947
 secret = True
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6948
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6949
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6950
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6951
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6952
 You will by default be managing a patch queue named "patches". You can
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6953
-create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6954
+create other, independent patch queues with the \fBhg qqueue\fP command.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6955
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6956
 If the working directory contains uncommitted files, qpush, qpop and
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6957
 qgoto abort immediately. If \-f/\-\-force is used, the changes are
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6958
@@ -9813,10 +9785,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6959
 discarded. Setting:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6960
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6961
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6962
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6963
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6964
 [mq]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6965
 keepchanges = True
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6966
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6967
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6968
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6969
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6970
 make them behave as if \-\-keep\-changes were passed, and non\-conflicting
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6971
@@ -9831,15 +9803,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6972
 print the patches already applied:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6973
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6974
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6975
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6976
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6977
 hg qapplied [\-1] [\-s] [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6978
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6979
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6980
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6981
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6982
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6983
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6984
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6985
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6986
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6987
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6988
 .B \-1,  \-\-last
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6989
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6990
@@ -9848,15 +9820,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6991
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6992
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6993
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6994
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6995
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6996
 .SS qclone
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6997
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6998
 clone main and patch repository at same time:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6999
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7000
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7001
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7002
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7003
 hg qclone [OPTION]... SOURCE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7004
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7005
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7006
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7007
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7008
 If source is local, destination will have no patches applied. If
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7009
@@ -9869,12 +9841,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7010
 default. Use \-p <url> to change.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7011
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7012
 The patch directory must be a nested Mercurial repository, as
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7013
-would be created by \%\fBhg init \-\-mq\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7014
+would be created by \fBhg init \-\-mq\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7015
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7016
 Return 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7017
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7018
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7019
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7020
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7021
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7022
 .B \-\-pull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7023
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7024
@@ -9903,21 +9875,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7025
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7026
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7027
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7028
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7029
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7030
 .SS qcommit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7031
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7032
 commit changes in the queue repository (DEPRECATED):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7033
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7034
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7035
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7036
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7037
 hg qcommit [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7038
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7039
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7040
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7041
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7042
-This command is deprecated; use \%\fBhg commit \-\-mq\fP\: instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7043
+This command is deprecated; use \fBhg commit \-\-mq\fP instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7044
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7045
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7046
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7047
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7048
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7049
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7050
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7051
@@ -9966,23 +9938,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7052
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7053
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7054
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7055
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7056
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7057
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7058
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7059
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7060
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7061
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7062
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7063
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7064
 aliases: qci
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7065
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7066
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7067
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7068
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7069
 .SS qdelete
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7070
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7071
 remove patches from queue:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7072
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7073
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7074
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7075
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7076
 hg qdelete [\-k] [PATCH]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7077
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7078
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7079
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7080
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7081
 The patches must not be applied, and at least one patch is required. Exact
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7082
@@ -9990,10 +9962,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7083
 preserved in the patch directory.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7084
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7085
 To stop managing a patch and move it into permanent history,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7086
-use the \%\fBhg qfinish\fP\: command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7087
+use the \fBhg qfinish\fP command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7088
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7089
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7090
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7091
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7092
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7093
 .B \-k,  \-\-keep
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7094
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7095
@@ -10002,23 +9974,23 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7096
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7097
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7098
 stop managing a revision (DEPRECATED)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7099
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7100
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7101
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7102
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7103
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7104
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7105
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7106
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7107
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7108
 aliases: qremove qrm
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7109
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7110
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7111
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7112
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7113
 .SS qdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7114
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7115
 diff of the current patch and subsequent modifications:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7116
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7117
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7118
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7119
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7120
 hg qdiff [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7121
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7122
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7123
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7124
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7125
 Shows a diff which includes the current patch as well as any
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7126
@@ -10026,8 +9998,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7127
 last refresh (thus showing what the current patch would become
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7128
 after a qrefresh).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7129
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7130
-Use \%\fBhg diff\fP\: if you only want to see the changes made since the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7131
-last qrefresh, or \%\fBhg export qtip\fP\: if you want to see changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7132
+Use \fBhg diff\fP if you only want to see the changes made since the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7133
+last qrefresh, or \fBhg export qtip\fP if you want to see changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7134
 made by the current patch without including changes made since the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7135
 qrefresh.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7136
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7137
@@ -10034,7 +10006,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7138
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7139
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7140
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7141
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7142
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7143
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7144
 .B \-a,  \-\-text
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7145
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7146
@@ -10083,7 +10055,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7147
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7148
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7149
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7150
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7151
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7152
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7153
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7154
 .SS qfinish
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7155
@@ -10091,9 +10063,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7156
 move applied patches into repository history:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7157
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7158
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7159
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7160
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7161
 hg qfinish [\-a] [REV]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7162
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7163
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7164
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7165
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7166
 Finishes the specified revisions (corresponding to applied
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7167
@@ -10112,20 +10084,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7168
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7169
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7170
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7171
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7172
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7173
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7174
 .B \-a,  \-\-applied
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7175
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7176
 finish all applied changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7177
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7178
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7179
 .SS qfold
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7180
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7181
 fold the named patches into the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7182
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7183
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7184
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7185
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7186
 hg qfold [\-e] [\-k] [\-m TEXT] [\-l FILE] PATCH...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7187
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7188
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7189
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7190
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7191
 Patches must not yet be applied. Each patch will be successively
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7192
@@ -10141,7 +10113,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7193
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7194
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7195
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7196
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7197
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7198
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7199
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7200
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7201
@@ -10158,21 +10130,21 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7202
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7203
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7204
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7205
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7206
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7207
 .SS qgoto
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7208
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7209
 push or pop patches until named patch is at top of stack:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7210
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7211
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7212
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7213
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7214
 hg qgoto [OPTION]... PATCH
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7215
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7216
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7217
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7218
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7219
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7220
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7221
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7222
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7223
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7224
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7225
 .B \-\-keep\-changes
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7226
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7227
@@ -10185,21 +10157,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7228
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7229
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7230
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7231
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7232
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7233
 .SS qguard
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7234
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7235
 set or print guards for a patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7236
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7237
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7238
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7239
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7240
 hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7241
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7242
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7243
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7244
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7245
 Guards control whether a patch can be pushed. A patch with no
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7246
 guards is always pushed. A patch with a positive guard ("+foo") is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7247
-pushed only if the \%\fBhg qselect\fP\: command has activated it. A patch with
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7248
-a negative guard ("\-foo") is never pushed if the \%\fBhg qselect\fP\: command
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7249
+pushed only if the \fBhg qselect\fP command has activated it. A patch with
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7250
+a negative guard ("\-foo") is never pushed if the \fBhg qselect\fP command
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7251
 has activated it.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7252
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7253
 With no arguments, print the currently active guards.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7254
@@ -10206,21 +10178,21 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7255
 With arguments, set guards for the named patch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7256
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7257
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7258
-Specifying negative guards now requires \(aq\-\-\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7259
+Specifying negative guards now requires '\-\-'.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  7260
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7261
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7262
 To set guards on another patch:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7263
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7264
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7265
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7266
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7267
 hg qguard other.patch \-\- +2.6.17 \-stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7268
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7269
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7270
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7271
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7272
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7273
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7274
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7275
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7276
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7277
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7278
 .B \-l,  \-\-list
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7279
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7280
@@ -10229,15 +10201,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7281
 .B \-n,  \-\-none
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7282
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7283
 drop all guards
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7284
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7285
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7286
 .SS qheader
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7287
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7288
 print the header of the topmost or specified patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7289
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7290
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7291
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7292
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7293
 hg qheader [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7294
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7295
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7296
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7297
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7298
 Returns 0 on success.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7299
@@ -10246,9 +10218,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7300
 import a patch or existing changeset:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7301
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7302
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7303
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7304
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7305
 hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... [FILE]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7306
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7307
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7308
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7309
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7310
 The patch is inserted into the series after the last applied
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7311
@@ -10269,7 +10241,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7312
 under mq control). With \-g/\-\-git, patches imported with \-\-rev will
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7313
 use the git diff format. See the diffs help topic for information
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7314
 on why this is important for preserving rename/copy information
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7315
-and permission changes. Use \%\fBhg qfinish\fP\: to remove changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7316
+and permission changes. Use \fBhg qfinish\fP to remove changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7317
 from mq control.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7318
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7319
 To import a patch from standard input, pass \- as the patch file.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7320
@@ -10279,15 +10251,15 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7321
 To import an existing patch while renaming it:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7322
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7323
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7324
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7325
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7326
 hg qimport \-e existing\-patch \-n new\-name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7327
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7328
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7329
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7330
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7331
 Returns 0 if import succeeded.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7332
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7333
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7334
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7335
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7336
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7337
 .B \-e,  \-\-existing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7338
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7339
@@ -10312,7 +10284,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7340
 .B \-P,  \-\-push
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7341
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7342
 qpush after importing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7343
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7344
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7345
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7346
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7347
 .SS qinit
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7348
@@ -10320,9 +10292,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7349
 init a new queue repository (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7350
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7351
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7352
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7353
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7354
 hg qinit [\-c]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7355
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7356
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7357
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7358
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7359
 The queue repository is unversioned by default. If
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7360
@@ -10331,24 +10303,24 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7361
 an unversioned patch repository into a versioned one). You can use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7362
 qcommit to commit changes to this queue repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7363
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7364
-This command is deprecated. Without \-c, it\(aqs implied by other relevant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7365
-commands. With \-c, use \%\fBhg init \-\-mq\fP\: instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7366
+This command is deprecated. Without \-c, it's implied by other relevant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7367
+commands. With \-c, use \fBhg init \-\-mq\fP instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7368
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7369
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7370
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7371
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7372
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7373
 .B \-c,  \-\-create\-repo
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7374
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7375
 create queue repository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7376
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7377
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7378
 .SS qnew
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7379
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7380
 create a new patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7381
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7382
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7383
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7384
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7385
 hg qnew [\-e] [\-m TEXT] [\-l FILE] PATCH [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7386
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7387
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7388
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7389
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7390
 qnew creates a new patch on top of the currently\-applied patch (if
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7391
@@ -10364,7 +10336,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7392
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7393
 \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7394
 well as the commit message. If none is specified, the header is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7395
-empty and the commit message is \(aq[mq]: PATCH\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7396
+empty and the commit message is '[mq]: PATCH'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7397
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7398
 Use the \-g/\-\-git option to keep the patch in the git extended diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7399
 format. Read the diffs help topic for more information on why this
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7400
@@ -10374,7 +10346,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7401
 Returns 0 on successful creation of a new patch.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7402
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7403
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7404
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7405
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7406
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7407
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7408
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7409
@@ -10419,7 +10391,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7410
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7411
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7412
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7413
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7414
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7415
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7416
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7417
 .SS qnext
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7418
@@ -10427,28 +10399,28 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7419
 print the name of the next pushable patch:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7420
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7421
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7422
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7423
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7424
 hg qnext [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7425
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7426
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7427
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7428
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7429
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7430
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7431
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7432
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7433
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7434
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7435
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7436
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7437
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7438
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7439
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7440
 .SS qpop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7441
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7442
 pop the current patch off the stack:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7443
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7444
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7445
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7446
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7447
 hg qpop [\-a] [\-f] [PATCH | INDEX]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7448
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7449
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7450
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7451
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7452
 Without argument, pops off the top of the patch stack. If given a
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7453
@@ -10463,7 +10435,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7454
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7455
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7456
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7457
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7458
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7459
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7460
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7461
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7462
@@ -10484,34 +10456,34 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7463
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7464
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7465
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7466
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7467
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7468
 .SS qprev
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7469
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7470
 print the name of the preceding applied patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7471
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7472
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7473
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7474
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7475
 hg qprev [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7476
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7477
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7478
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7479
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7480
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7481
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7482
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7483
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7484
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7485
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7486
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7487
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7488
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7489
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7490
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7491
 .SS qpush
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7492
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7493
 push the next patch onto the stack:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7494
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7495
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7496
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7497
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7498
 hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7499
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7500
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7501
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7502
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7503
 By default, abort if the working directory contains uncommitted
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7504
@@ -10522,7 +10494,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7505
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7506
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7507
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7508
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7509
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7510
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7511
 .B \-\-keep\-changes
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7512
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7513
@@ -10559,15 +10531,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7514
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7515
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7516
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7517
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7518
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7519
 .SS qqueue
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7520
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7521
 manage multiple patch queues:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7522
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7523
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7524
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7525
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7526
 hg qqueue [OPTION] [QUEUE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7527
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7528
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7529
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7530
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7531
 Supports switching between different patch queues, as well as creating
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7532
@@ -10589,7 +10561,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7533
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7534
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7535
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7536
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7537
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7538
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7539
 .B \-l,  \-\-list
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7540
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7541
@@ -10614,15 +10586,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7542
 .B \-\-purge
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7543
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7544
 delete queue, and remove patch dir
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7545
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7546
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7547
 .SS qrefresh
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7548
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7549
 update the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7550
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7551
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7552
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7553
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7554
 hg qrefresh [\-I] [\-X] [\-e] [\-m TEXT] [\-l FILE] [\-s] [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7555
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7556
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7557
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7558
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7559
 If any file patterns are provided, the refreshed patch will
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7560
@@ -10644,7 +10616,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7561
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7562
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7563
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7564
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7565
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7566
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7567
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7568
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7569
@@ -10689,7 +10661,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7570
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7571
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7572
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7573
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7574
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7575
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7576
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7577
 .SS qrename
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7578
@@ -10697,9 +10669,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7579
 rename a patch:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7580
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7581
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7582
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7583
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7584
 hg qrename PATCH1 [PATCH2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7585
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7586
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7587
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7588
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7589
 With one argument, renames the current patch to PATCH1.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7590
@@ -10706,26 +10678,26 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7591
 With two arguments, renames PATCH1 to PATCH2.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7592
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7593
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7594
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7595
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7596
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7597
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7598
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7599
 aliases: qmv
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7600
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7601
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7602
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7603
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7604
 .SS qrestore
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7605
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7606
 restore the queue state saved by a revision (DEPRECATED):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7607
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7608
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7609
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7610
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7611
 hg qrestore [\-d] [\-u] REV
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7612
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7613
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7614
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7615
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7616
-This command is deprecated, use \%\fBhg rebase\fP\: instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7617
+This command is deprecated, use \fBhg rebase\fP instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7618
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7619
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7620
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7621
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7622
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7623
 .B \-d,  \-\-delete
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7624
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7625
@@ -10734,21 +10706,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7626
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7627
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7628
 update queue working directory
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7629
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7630
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7631
 .SS qsave
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7632
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7633
 save current queue state (DEPRECATED):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7634
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7635
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7636
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7637
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7638
 hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7639
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7640
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7641
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7642
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7643
-This command is deprecated, use \%\fBhg rebase\fP\: instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7644
+This command is deprecated, use \fBhg rebase\fP instead.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7645
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7646
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7647
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7648
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7649
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7650
 .B \-c,  \-\-copy
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7651
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7652
@@ -10773,18 +10745,18 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7653
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7654
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7655
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7656
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7657
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7658
 .SS qselect
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7659
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7660
 set or print guarded patches to push:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7661
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7662
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7663
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7664
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7665
 hg qselect [OPTION]... [GUARD]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7666
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7667
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7668
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7669
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7670
-Use the \%\fBhg qguard\fP\: command to set or print guards on patch, then use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7671
+Use the \fBhg qguard\fP command to set or print guards on patch, then use
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7672
 qselect to tell mq which guards to use. A patch will be pushed if
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7673
 it has no guards or any positive guards match the currently
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7674
 selected guard, but will not be pushed if any negative guards
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7675
@@ -10791,11 +10763,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7676
 match the current guard. For example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7677
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7678
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7679
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7680
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7681
 qguard foo.patch \-\- \-stable    (negative guard)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7682
 qguard bar.patch    +stable    (positive guard)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7683
 qselect stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7684
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7685
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7686
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7687
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7688
 This activates the "stable" guard. mq will skip foo.patch (because
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7689
@@ -10821,7 +10793,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7690
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7691
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7692
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7693
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7694
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7695
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7696
 .B \-n,  \-\-none
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7697
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7698
@@ -10838,21 +10810,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7699
 .B \-\-reapply
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7700
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7701
 pop, then reapply patches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7702
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7703
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7704
 .SS qseries
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7705
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7706
 print the entire series file:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7707
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7708
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7709
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7710
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7711
 hg qseries [\-ms]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7712
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7713
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7714
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7715
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7716
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7717
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7718
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7719
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7720
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7721
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7722
 .B \-m,  \-\-missing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7723
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7724
@@ -10861,40 +10833,40 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7725
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7726
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7727
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7728
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7729
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7730
 .SS qtop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7731
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7732
 print the name of the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7733
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7734
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7735
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7736
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7737
 hg qtop [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7738
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7739
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7740
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7741
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7742
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7743
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7744
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7745
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7746
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7747
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7748
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7749
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7750
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7751
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7752
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7753
 .SS qunapplied
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7754
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7755
 print the patches not yet applied:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7756
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7757
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7758
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7759
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7760
 hg qunapplied [\-1] [\-s] [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7761
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7762
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7763
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7764
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7765
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7766
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7767
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7768
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7769
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7770
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7771
 .B \-1,  \-\-first
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7772
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7773
@@ -10903,7 +10875,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7774
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7775
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7776
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7777
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7778
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7779
 .SS notify
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7780
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7781
 hooks for sending email push notifications
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7782
@@ -10911,13 +10883,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7783
 This extension implements hooks to send email notifications when
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7784
 changesets are sent from or received by the local repository.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7785
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7786
-First, enable the extension as explained in \%\fBhg help extensions\fP\:, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7787
+First, enable the extension as explained in \fBhg help extensions\fP, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7788
 register the hook you want to run. \fBincoming\fP and \fBchangegroup\fP hooks
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7789
 are run when changesets are received, while \fBoutgoing\fP hooks are for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7790
 changesets sent to another repository:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7791
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7792
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7793
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7794
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7795
 [hooks]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7796
 # one email for each incoming changeset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7797
 incoming.notify = python:hgext.notify.hook
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7798
@@ -10926,7 +10898,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7799
 
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7800
 # one email for all outgoing changesets
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7801
 outgoing.notify = python:hgext.notify.hook
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7802
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7803
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7804
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7805
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7806
 This registers the hooks. To enable notification, subscribers must
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7807
@@ -10935,7 +10907,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7808
 multiple recipients to a single repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7809
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7810
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7811
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7812
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7813
 [usersubs]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7814
 # key is subscriber email, value is a comma\-separated list of repo patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7815
 user@host = pattern
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7816
@@ -10943,7 +10915,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7817
 [reposubs]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7818
 # key is repo pattern, value is a comma\-separated list of subscriber emails
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7819
 pattern = user@host
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7820
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7821
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7822
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7823
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7824
 A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7825
@@ -10951,10 +10923,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7826
 present, is separated from the glob by a hash. Example:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7827
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7828
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7829
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7830
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7831
 [reposubs]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7832
 */widgets#branch(release) = qa\[email protected]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7833
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7834
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7835
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7836
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7837
 This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7838
@@ -10965,10 +10937,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7839
 incorporated by reference:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7840
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7841
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7842
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7843
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7844
 [notify]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7845
 config = /path/to/subscriptionsfile
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7846
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7847
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7848
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7849
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7850
 Notifications will not be sent until the \fBnotify.test\fP value is set
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7851
@@ -10975,7 +10947,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7852
 to \fBFalse\fP; see below.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7853
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7854
 Notifications content can be tweaked with the following configuration entries:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7855
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7856
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7857
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7858
 .B notify.test
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7859
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7860
@@ -10984,8 +10956,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7861
 .B notify.sources
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7862
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7863
 Space\-separated list of change sources. Notifications are activated only
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7864
-when a changeset\(aqs source is in this list. Sources may be:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7865
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7866
+when a changeset's source is in this list. Sources may be:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7867
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7868
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7869
 .B \fBserve\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7870
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7871
@@ -11006,7 +10978,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7872
 .B \fBbundle\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7873
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7874
 changesets sent via \fBhg unbundle\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7875
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7876
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7877
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7878
 Default: serve.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7879
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7880
@@ -11049,7 +11021,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7881
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7882
 .B notify.maxsubject
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7883
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7884
-Maximum number of characters in email\(aqs subject line. Default: 67.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7885
+Maximum number of characters in email's subject line. Default: 67.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7886
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7887
 .B notify.diffstat
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7888
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7889
@@ -11068,11 +11040,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7890
 If set, use the committer of the first changeset in a changegroup for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7891
 the "From" field of the notification mail. If not set, take the user
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7892
 from the pushing repo.  Default: False.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7893
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7894
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7895
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7896
 If set, the following entries will also be used to customize the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7897
 notifications:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7898
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7899
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7900
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7901
 .B email.from
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7902
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7903
@@ -11083,7 +11055,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7904
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7905
 Root repository URL to combine with repository paths when making
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7906
 references. See also \fBnotify.strip\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7907
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7908
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7909
 .SS pager
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7910
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7911
 browse command output with an external pager
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7912
@@ -11091,10 +11063,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7913
 To set the pager that should be used, set the application variable:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7914
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7915
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7916
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7917
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7918
 [pager]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7919
 pager = less \-FRX
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7920
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7921
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7922
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7923
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7924
 If no pager is set, the pager extensions uses the environment variable
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7925
@@ -11104,10 +11076,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7926
 pager.ignore list:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7927
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7928
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7929
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7930
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7931
 [pager]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7932
 ignore = version, help, update
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7933
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7934
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7935
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7936
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7937
 You can also enable the pager only for certain commands using
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7938
@@ -11114,10 +11086,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7939
 pager.attend. Below is the default list of commands to be paged:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7940
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7941
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7942
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7943
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7944
 [pager]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7945
 attend = annotate, cat, diff, export, glog, log, qdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7946
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7947
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7948
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7949
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7950
 Setting pager.attend to an empty value will cause all commands to be
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7951
@@ -11125,7 +11097,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7952
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7953
 If pager.attend is present, pager.ignore will be ignored.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7954
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7955
-To ignore global commands like \%\fBhg version\fP\: or \%\fBhg help\fP\:, you have
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7956
+To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7957
 to specify them in your user configuration file.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7958
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7959
 The \-\-pager=... option can also be used to control when the pager is
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7960
@@ -11141,7 +11113,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7961
 Each patch email has a Subject line of "[PATCH M of N] ...", using the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7962
 first line of the changeset description as the subject text. The
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7963
 message contains two or three body parts:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7964
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7965
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7966
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7967
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7968
 The changeset description.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7969
@@ -11150,8 +11122,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7970
 [Optional] The result of running diffstat on the patch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7971
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7972
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7973
-The patch itself, as generated by \%\fBhg export\fP\:.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7974
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7975
+The patch itself, as generated by \fBhg export\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7976
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7977
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7978
 Each message refers to the first in the series using the In\-Reply\-To
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7979
 and References headers, so they will show up as a sequence in threaded
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7980
@@ -11161,7 +11133,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7981
 configuration file:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7982
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7983
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7984
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7985
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7986
 [email]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7987
 from = My Name <my@email>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7988
 to = recipient1, recipient2, ...
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7989
@@ -11168,13 +11140,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7990
 cc = cc1, cc2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7991
 bcc = bcc1, bcc2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7992
 reply\-to = address1, address2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7993
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7994
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7995
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7996
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7997
 Use \fB[patchbomb]\fP as configuration section name if you need to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7998
 override global \fB[email]\fP address settings.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7999
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8000
-Then you can use the \%\fBhg email\fP\: command to mail a series of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8001
+Then you can use the \fBhg email\fP command to mail a series of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8002
 changesets as a patchbomb.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8003
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8004
 You can also either configure the method option in the email section
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8005
@@ -11188,13 +11160,13 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8006
 send changesets by email:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8007
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8008
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8009
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8010
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8011
 hg email [OPTION]... [DEST]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8012
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8013
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8014
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8015
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8016
 By default, diffs are sent in the format generated by
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8017
-\%\fBhg export\fP\:, one per message. The series starts with a "[PATCH 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8018
+\fBhg export\fP, one per message. The series starts with a "[PATCH 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8019
 of N]" introduction, which describes the series as a whole.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8020
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8021
 Each patch email has a Subject line of "[PATCH M of N] ...", using
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8022
@@ -11205,7 +11177,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8023
 With the \-d/\-\-diffstat option, if the diffstat program is
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8024
 installed, the result of running diffstat on the patch is inserted.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8025
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8026
-Finally, the patch itself, as generated by \%\fBhg export\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8027
+Finally, the patch itself, as generated by \fBhg export\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8028
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8029
 With the \-d/\-\-diffstat or \-\-confirm options, you will be presented
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8030
 with a final summary of all messages and asked for confirmation before
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8031
@@ -11245,7 +11217,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8032
 Examples:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8033
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8034
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8035
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8036
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8037
 hg email \-r 3000          # send patch 3000 only
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8038
 hg email \-r 3000 \-r 3001  # send patches 3000 and 3001
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8039
 hg email \-r 3000:3005     # send patches 3000 through 3005
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8040
@@ -11266,7 +11238,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8041
 hg email \-o \-m mbox &&    # generate an mbox file ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8042
   formail \-s sendmail \e   # ... and use formail to send from the mbox
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8043
     \-bm \-t < mbox         # ... using sendmail
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8044
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8045
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8046
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8047
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8048
 Before using this command, you will need to enable email in your
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8049
@@ -11273,7 +11245,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8050
 hgrc. See the [email] section in hgrc(5) for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8051
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8052
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8053
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8054
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8055
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8056
 .B \-g,  \-\-git
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8057
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8058
@@ -11390,7 +11362,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8059
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8060
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8061
 do not verify server certificate (ignoring web.cacerts config)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8062
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8063
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8064
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8065
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8066
 .SS progress
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8067
@@ -11405,7 +11377,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8068
 The following settings are available:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8069
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8070
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8071
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8072
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8073
 [progress]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8074
 delay = 3 # number of seconds (float) before showing the progress bar
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8075
 changedelay = 1 # changedelay: minimum delay before showing a new topic.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8076
@@ -11415,11 +11387,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8077
 format = topic bar number estimate # format of the progress bar
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8078
 width = <none> # if set, the maximum width of the progress information
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8079
                # (that is, min(width, term width) will be used)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8080
-clear\-complete = True # clear the progress bar after it\(aqs done
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8081
-disable = False # if true, don\(aqt show a progress bar
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8082
+clear\-complete = True # clear the progress bar after it's done
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8083
+disable = False # if true, don't show a progress bar
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8084
 assume\-tty = False # if true, ALWAYS show a progress bar, unless
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8085
                    # disable is given
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8086
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8087
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8088
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8089
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8090
 Valid entries for the format field are topic, bar, number, unit,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8091
@@ -11436,9 +11408,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8092
 removes files not tracked by Mercurial:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8093
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8094
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8095
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8096
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8097
 hg purge [OPTION]... [DIR]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8098
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8099
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8100
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8101
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8102
 Delete files not known to Mercurial. This is useful to test local
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8103
@@ -11445,18 +11417,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8104
 and uncommitted changes in an otherwise\-clean source tree.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8105
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8106
 This means that purge will delete:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8107
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8108
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8109
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8110
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8111
-Unknown files: files marked with "?" by \%\fBhg status\fP\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8112
+Unknown files: files marked with "?" by \fBhg status\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8113
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8114
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8115
 Empty directories: in fact Mercurial ignores directories unless
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8116
 they contain files under source control management
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8117
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8118
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8119
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8120
 But it will leave untouched:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8121
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8122
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8123
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8124
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8125
 Modified and unmodified tracked files
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8126
@@ -11465,8 +11437,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8127
 Ignored files (unless \-\-all is specified)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8128
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8129
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8130
-New files added to the repository (with \%\fBhg add\fP\:)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8131
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8132
+New files added to the repository (with \fBhg add\fP)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8133
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8134
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8135
 If directories are given on the command line, only files in these
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8136
 directories are considered.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8137
@@ -11477,7 +11449,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8138
 option.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8139
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8140
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8141
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8142
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8143
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8144
 .B \-a,  \-\-abort\-on\-err
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8145
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8146
@@ -11502,15 +11474,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8147
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8148
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8149
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8150
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8151
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8152
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8153
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8154
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8155
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8156
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8157
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8158
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8159
 aliases: clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8160
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8161
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8162
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8163
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8164
 .SS rebase
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8165
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8166
 command to move sets of revisions to a different ancestor
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8167
@@ -11519,7 +11491,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8168
 repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8169
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8170
 For more information:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8171
-\%http://mercurial.selenic.com/wiki/RebaseExtension\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8172
+http://mercurial.selenic.com/wiki/RebaseExtension
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8173
 .SS Commands
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8174
 .SS rebase
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8175
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8176
@@ -11526,9 +11498,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8177
 move changeset (and descendants) to a different branch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8178
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8179
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8180
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8181
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8182
 hg rebase [\-s REV | \-b REV] [\-d REV] [OPTION]
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8183
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8184
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8185
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8186
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8187
 Rebase uses repeated merging to graft changesets from one part of
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8188
@@ -11542,9 +11514,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8189
 pulling in your rebased changesets.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8190
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8191
 In its default configuration, Mercurial will prevent you from
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8192
-rebasing published changes. See \%\fBhg help phases\fP\: for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8193
+rebasing published changes. See \fBhg help phases\fP for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8194
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8195
-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP),
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8196
+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP),
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8197
 rebase uses the current branch tip as the destination. (The
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8198
 destination changeset is not modified by rebasing, but new
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8199
 changesets are added as its descendants.)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8200
@@ -11576,7 +11548,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8201
 and source branch is that, unlike \fBmerge\fP, rebase will do
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8202
 nothing if you are at the branch tip of a named branch
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8203
 with two heads. You need to explicitly specify source and/or
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8204
-destination (or \fBupdate\fP to the other head, if it\(aqs the head of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8205
+destination (or \fBupdate\fP to the other head, if it's the head of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8206
 the intended source branch).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8207
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8208
 If a rebase is interrupted to manually resolve a merge, it can be
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8209
@@ -11586,7 +11558,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8210
 unresolved conflicts.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8211
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8212
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8213
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8214
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8215
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8216
 .BI \-s,  \-\-source \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8217
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8218
@@ -11651,7 +11623,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8219
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8220
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8221
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8222
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8223
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8224
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8225
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8226
 .SS record
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8227
@@ -11663,12 +11635,12 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8228
 interactively record a new patch:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8229
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8230
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8231
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8232
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8233
 hg qrecord [OPTION]... PATCH [FILE]...
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8234
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8235
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8236
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8237
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8238
-See \%\fBhg help qnew\fP\: & \%\fBhg help record\fP\: for more information and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8239
+See \fBhg help qnew\fP & \fBhg help record\fP for more information and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8240
 usage.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8241
 .SS record
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8242
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8243
@@ -11675,15 +11647,15 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8244
 interactively select changes to commit:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8245
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8246
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8247
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8248
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8249
 hg record [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8250
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8251
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8252
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8253
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8254
-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8255
+If a list of files is omitted, all changes reported by \fBhg status\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8256
 will be candidates for recording.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8257
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8258
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8259
+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8260
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8261
 You will be prompted for whether to record changes to each
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8262
 modified file, and for files with multiple changes, for each
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8263
@@ -11691,7 +11663,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8264
 possible:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8265
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8266
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8267
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8268
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8269
 y \- record this change
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8270
 n \- skip this change
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8271
 e \- edit this change manually
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8272
@@ -11704,13 +11676,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8273
 q \- quit, recording no changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8274
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8275
 ? \- display help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8276
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8277
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8278
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8279
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8280
 This command is not available when committing a merge.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8281
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8282
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8283
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8284
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8285
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8286
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8287
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8288
@@ -11771,7 +11743,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8289
 .B \-B,  \-\-ignore\-blank\-lines
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8290
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8291
 ignore changes whose lines are all blank
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8292
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8293
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8294
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8295
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8296
 .SS relink
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8297
@@ -11783,9 +11755,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8298
 recreate hardlinks between two repositories:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8299
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8300
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8301
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8302
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8303
 hg relink [ORIGIN]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8304
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8305
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8306
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8307
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8308
 When repositories are cloned locally, their data files will be
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8309
@@ -11817,18 +11789,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8310
 lot of repositories to act like a scheme, for example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8311
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8312
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8313
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8314
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8315
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8316
 py = http://code.python.org/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8317
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8318
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8319
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8320
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8321
 After that you can use it like:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8322
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8323
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8324
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8325
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8326
 hg clone py://trunk/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8327
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8328
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8329
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8330
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8331
 Additionally there is support for some more complex schemas, for
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8332
@@ -11835,10 +11807,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8333
 example used by Google Code:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8334
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8335
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8336
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8337
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8338
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8339
 gcode = http://{1}.googlecode.com/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8340
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8341
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8342
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8343
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8344
 The syntax is taken from Mercurial templates, and you have unlimited
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8345
@@ -11850,7 +11822,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8346
 For convenience, the extension adds these schemes by default:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8347
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8348
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8349
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8350
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8351
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8352
 py = http://hg.python.org/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8353
 bb = https://bitbucket.org/
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8354
@@ -11857,7 +11829,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8355
 bb+ssh = ssh://[email protected]/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8356
 gcode = https://{1}.googlecode.com/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8357
 kiln = https://{1}.kilnhg.com/Repo/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8358
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8359
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8360
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8361
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8362
 You can override a predefined scheme by defining a new scheme with the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8363
@@ -11871,9 +11843,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8364
 create a new shared repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8365
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8366
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8367
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8368
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8369
 hg share [\-U] SOURCE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8370
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8371
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8372
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8373
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8374
 Initialize a new repository and working directory that shares its
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8375
@@ -11891,20 +11863,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8376
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8377
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8378
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8379
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8380
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8381
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8382
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8383
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8384
 do not create a working copy
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8385
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8386
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8387
 .SS unshare
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8388
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8389
 convert a shared repository to a normal one:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8390
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8391
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8392
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8393
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8394
 hg unshare
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8395
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8396
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8397
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8398
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8399
 Copy the store data to the repo and remove the sharedpath data.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8400
@@ -11918,7 +11890,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8401
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8402
 Later on, the "hg unshelve" command restores the changes saved by "hg
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8403
 shelve". Changes can be restored even after updating to a different
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8404
-parent, in which case Mercurial\(aqs merge machinery will resolve any
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8405
+parent, in which case Mercurial's merge machinery will resolve any
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8406
 conflicts if necessary.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8407
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8408
 You can have more than one shelved change outstanding at a time; each
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8409
@@ -11930,9 +11902,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8410
 save and set aside changes from the working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8411
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8412
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8413
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8414
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8415
 hg shelve [OPTION]... [FILE]...
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8416
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8417
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8418
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8419
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8420
 Shelving takes files that "hg status" reports as not clean, saves
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8421
@@ -11960,7 +11932,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8422
 all shelved changes, use \fB\-\-cleanup\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8423
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8424
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8425
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8426
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8427
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8428
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8429
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8430
@@ -12005,7 +11977,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8431
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8432
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8433
 exclude names matching the given patterns
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8434
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8435
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8436
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8437
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8438
 .SS unshelve
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8439
@@ -12013,9 +11985,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8440
 restore a shelved change to the working directory:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8441
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8442
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8443
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8444
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8445
 hg unshelve [SHELVED]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8446
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8447
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8448
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8449
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8450
 This command accepts an optional name of a shelved change to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8451
@@ -12036,7 +12008,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8452
 does not delete the bundle.)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8453
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8454
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8455
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8456
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8457
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8458
 .B \-a,  \-\-abort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8459
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8460
@@ -12053,7 +12025,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8461
 .BI \-\-date \ <DATE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8462
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8463
 set date for temporary commits (DEPRECATED)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8464
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8465
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8466
 .SS strip
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8467
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8468
 strip changesets and their descendents from history
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8469
@@ -12066,9 +12038,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8470
 strip changesets and all their descendants from the repository:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8471
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8472
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8473
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8474
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8475
 hg strip [\-k] [\-f] [\-n] [\-B bookmark] [\-r] REV...
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8476
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8477
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8478
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8479
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8480
 The strip command removes the specified changesets and all their
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8481
@@ -12082,8 +12054,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8482
 completes.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8483
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8484
 Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8485
-bundle (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:). They can
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8486
-be restored by running \%\fBhg unbundle .hg/strip\-backup/BUNDLE\fP\:,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8487
+bundle (see \fBhg help bundle\fP and \fBhg help unbundle\fP). They can
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8488
+be restored by running \fBhg unbundle .hg/strip\-backup/BUNDLE\fP,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8489
 where BUNDLE is the bundle file created by the strip. Note that
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8490
 the local revision numbers will in general be different after the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8491
 restore.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8492
@@ -12098,7 +12070,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8493
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8494
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8495
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8496
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8497
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8498
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8499
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8500
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8501
@@ -12131,7 +12103,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8502
 .BI \-B,  \-\-bookmark \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8503
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8504
 remove revs only reachable from given bookmark
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8505
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8506
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8507
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8508
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8509
 .SS transplant
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8510
@@ -12139,7 +12111,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8511
 command to transplant changesets from another branch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8512
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8513
 This extension allows you to transplant changes to another parent revision,
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8514
-possibly in another repository. The transplant is done using \(aqdiff\(aq patches.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8515
+possibly in another repository. The transplant is done using 'diff' patches.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8516
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8517
 Transplanted patches are recorded in .hg/transplant/transplants, as a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8518
 map from a changeset hash to its hash in the source repository.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8519
@@ -12149,9 +12121,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8520
 transplant changesets from another branch:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8521
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8522
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8523
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8524
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8525
 hg transplant [\-s REPO] [\-b BRANCH [\-a]] [\-p REV] [\-m REV] [REV]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8526
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8527
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8528
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8529
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8530
 Selected changesets will be applied on top of the current working
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8531
@@ -12168,9 +12140,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8532
 of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8533
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8534
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8535
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8536
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8537
 (transplanted from CHANGESETHASH)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8538
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8539
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8540
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8541
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8542
 You can rewrite the changelog message with the \-\-filter option.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8543
@@ -12186,17 +12158,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8544
 with \-\-branch will be transplanted.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8545
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8546
 Example:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8547
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8548
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8549
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8550
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8551
 transplant all changes up to REV on top of your current revision:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8552
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8553
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8554
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8555
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8556
 hg transplant \-\-branch REV \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8557
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8558
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8559
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8560
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8561
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8562
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8563
 You can optionally mark selected transplanted changesets as merge
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8564
 changesets. You will not be prompted to transplant any ancestors
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8565
@@ -12204,17 +12176,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8566
 normally instead of transplanting them.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8567
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8568
 Merge changesets may be transplanted directly by specifying the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8569
-proper parent changeset by calling \%\fBhg transplant \-\-parent\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8570
+proper parent changeset by calling \fBhg transplant \-\-parent\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8571
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8572
-If no merges or revisions are provided, \%\fBhg transplant\fP\: will
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8573
+If no merges or revisions are provided, \fBhg transplant\fP will
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8574
 start an interactive changeset browser.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8575
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8576
 If a changeset application fails, you can fix the merge by hand
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8577
-and then resume where you left off by calling \%\fBhg transplant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8578
-\-\-continue/\-c\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8579
+and then resume where you left off by calling \fBhg transplant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8580
+\-\-continue/\-c\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8581
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8582
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8583
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8584
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8585
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8586
 .BI \-s,  \-\-source \ <REPO>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8587
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8588
@@ -12255,7 +12227,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8589
 .BI \-\-filter \ <CMD>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8590
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8591
 filter changesets through command
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8592
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8593
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8594
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8595
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8596
 .SS win32mbcs
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8597
@@ -12270,7 +12242,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8598
 operation.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8599
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8600
 This extension is useful for:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8601
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8602
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8603
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8604
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8605
 Japanese Windows users using shift_jis encoding.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8606
@@ -12281,10 +12253,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8607
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8608
 All users who use a repository with one of problematic encodings on
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8609
 case\-insensitive file system.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8610
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8611
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8612
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8613
 This extension is not needed for:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8614
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8615
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8616
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8617
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8618
 Any user who use only ASCII chars in path.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8619
@@ -12291,10 +12263,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8620
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8621
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8622
 Any user who do not use any of problematic encodings.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8623
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8624
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8625
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8626
 Note that there are some limitations on using this extension:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8627
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8628
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8629
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8630
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8631
 You should use single encoding in one repository.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8632
@@ -12304,16 +12276,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8633
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8634
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8635
 win32mbcs is not compatible with fixutf8 extension.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8636
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8637
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8638
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8639
 By default, win32mbcs uses encoding.encoding decided by Mercurial.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8640
 You can specify the encoding by config option:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8641
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8642
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8643
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8644
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8645
 [win32mbcs]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8646
 encoding = sjis
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8647
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8648
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8649
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8650
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8651
 It is useful for the users who want to commit with UTF\-8 log message.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8652
@@ -12320,8 +12292,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8653
 .SS win32text
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8654
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8655
 perform automatic newline conversion (DEPRECATED)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8656
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8657
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8658
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8659
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8660
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8661
 Deprecation: The win32text extension requires each user to configure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8662
 the extension again and again for each clone since the configuration
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8663
@@ -12330,13 +12302,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8664
 We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8665
 uses a version controlled file for its configuration and each clone
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8666
 will therefore use the right settings from the start.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8667
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8668
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8669
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8670
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8671
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8672
 To perform automatic newline conversion, use:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8673
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8674
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8675
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8676
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8677
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8678
 win32text =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8679
 [encode]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8680
@@ -12346,17 +12318,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8681
 [decode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8682
 ** = cleverdecode:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8683
 # or ** = macdecode:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8684
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8685
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8686
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8687
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8688
 If not doing conversion, to make sure you do not commit CRLF/CR by accident:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8689
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8690
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8691
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8692
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8693
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8694
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8695
 # or pretxncommit.cr = python:hgext.win32text.forbidcr
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8696
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8697
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8698
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8699
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8700
 To do the same check on a server to prevent CRLF/CR from being
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8701
@@ -12363,11 +12335,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8702
 pushed or pulled:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8703
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8704
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8705
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8706
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8707
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8708
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8709
 # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8710
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8711
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8712
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8713
 .SS zeroconf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8714
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8715
@@ -12378,33 +12350,33 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8716
 without knowing their actual IP address.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8717
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8718
 To allow other people to discover your repository using run
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8719
-\%\fBhg serve\fP\: in your repository:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8720
+\fBhg serve\fP in your repository:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8721
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8722
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8723
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8724
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8725
 $ cd test
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8726
 $ hg serve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8727
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8728
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8729
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8730
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8731
 You can discover Zeroconf\-enabled repositories by running
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8732
-\%\fBhg paths\fP\::
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8733
+\fBhg paths\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8734
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8735
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8736
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8737
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8738
 $ hg paths
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8739
 zc\-test = http://example.com:8000/test
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8740
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8741
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8742
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8743
 .SH FILES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8744
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8745
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8746
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8747
 .B \fB/etc/mercurial/hgrc\fP, \fB$HOME/.hgrc\fP, \fB.hg/hgrc\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8748
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8749
 This file contains defaults and configuration. Values in
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8750
-\fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8751
+\fB\&.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8752
 settings made in the global \fB/etc/mercurial/hgrc\fP configuration.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8753
-See \%\fBhgrc\fP(5)\: for details of the contents and format of these
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8754
+See \fBhgrc\fP(5) for details of the contents and format of these
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8755
 files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8756
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8757
 .B \fB.hgignore\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8758
@@ -12411,13 +12383,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8759
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8760
 This file contains regular expressions (one per line) that
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8761
 describe file names that should be ignored by \fBhg\fP. For details,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8762
-see \%\fBhgignore\fP(5)\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8763
+see \fBhgignore\fP(5).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8764
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8765
 .B \fB.hgsub\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8766
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8767
 This file defines the locations of all subrepositories, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8768
 tells where the subrepository checkouts came from. For details, see
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8769
-\%\fBhg help subrepos\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8770
+\fBhg help subrepos\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8771
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8772
 .B \fB.hgsubstate\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8773
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8774
@@ -12432,7 +12404,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8775
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8776
 .B \fB.hg/last\-message.txt\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8777
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8778
-This file is used by \%\fBhg commit\fP\: to store a backup of the commit message
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8779
+This file is used by \fBhg commit\fP to store a backup of the commit message
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8780
 in case the commit fails.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8781
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8782
 .B \fB.hg/localtags\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8783
@@ -12440,28 +12412,34 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8784
 This file can be used to define local tags which are not shared among
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8785
 repositories. The file format is the same as for \fB.hgtags\fP, but it is
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8786
 encoded using the local system encoding.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8787
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8788
+.TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8789
+.B \fB/usr/demo/mercurial\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8790
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8791
+This directory contains assorted files which are part of the Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8792
+distribution, but not core to its functionality.  They will generally
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8793
+need to be copied elsewhere to be of use.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8794
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8795
+.sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8796
 Some commands (e.g. revert) produce backup files ending in \fB.orig\fP,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8797
 if the \fB.orig\fP file already exists and is not tracked by Mercurial,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8798
 it will be overwritten.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8799
 .SH BUGS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8800
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8801
-Probably lots, please post them to the mailing list (see \%Resources\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8802
+Probably lots, please post them to the mailing list (see Resources
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8803
 below) when you find them.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8804
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8805
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8806
-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8807
+\fBhgignore\fP(5), \fBhgrc\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8808
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8809
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8810
-Written by Matt Mackall <\%[email protected]\:>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8811
+Written by Matt Mackall <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8812
 .SH RESOURCES
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8813
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8814
-Main Web Site: \%http://mercurial.selenic.com/\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8815
+Main Web Site: http://mercurial.selenic.com/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8816
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8817
-Source code repository: \%http://selenic.com/hg\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8818
+Source code repository: http://selenic.com/hg
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8819
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8820
-Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8821
+Mailing list: http://selenic.com/mailman/listinfo/mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8822
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8823
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8824
 Copyright (C) 2005\-2014 Matt Mackall.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8825
--- mercurial-3.0.1/doc/hgignore.5.orig	Sun Jun  1 14:15:47 2014
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8826
+++ mercurial-3.0.1/doc/hgignore.5	Fri Jun  6 10:48:12 2014
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8827
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8828
 .TH HGIGNORE 5 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8829
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8830
 hgignore \- syntax for Mercurial ignore files
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8831
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8832
-.nr rst2man-indent-level 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8833
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8834
-.de1 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8835
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8836
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8837
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8838
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8839
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8840
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8841
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8842
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8843
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8844
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8845
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8846
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8847
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8848
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8849
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8850
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8851
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8852
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8853
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8854
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8855
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8856
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8857
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8858
 .SH SYNOPSIS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8859
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8860
 The Mercurial system uses a file called \fB.hgignore\fP in the root
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8861
@@ -55,16 +28,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8862
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8863
 In addition, a Mercurial configuration file can reference a set of
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8864
 per\-user or global ignore files. See the \fBignore\fP configuration
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8865
-key on the \fB[ui]\fP section of \%\fBhg help config\fP\: for details of how to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8866
+key on the \fB[ui]\fP section of \fBhg help config\fP for details of how to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8867
 configure these files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8868
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8869
-To control Mercurial\(aqs handling of files that it manages, many
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8870
+To control Mercurial's handling of files that it manages, many
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8871
 commands support the \fB\-I\fP and \fB\-X\fP options; see
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8872
-\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8873
+\fBhg help <command>\fP and \fBhg help patterns\fP for details.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8874
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8875
 Files that are already tracked are not affected by .hgignore, even
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8876
 if they appear in .hgignore. An untracked file X can be explicitly
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8877
-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8878
+added with \fBhg add X\fP, even if X would be excluded by a pattern
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8879
 in .hgignore.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8880
 .SH SYNTAX
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8881
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8882
@@ -79,13 +52,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8883
 To change the syntax used, use a line of the following form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8884
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8885
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8886
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8887
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8888
 syntax: NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8889
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8890
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8891
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8892
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8893
 where \fBNAME\fP is one of the following:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8894
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8895
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8896
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8897
 .B \fBregexp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8898
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8899
@@ -94,7 +67,7 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8900
 .B \fBglob\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8901
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8902
 Shell\-style glob.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8903
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8904
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8905
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8906
 The chosen syntax stays in effect when parsing all patterns that
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8907
 follow, until another syntax is selected.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8908
@@ -106,7 +79,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8909
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8910
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8911
 Patterns specified in other than \fB.hgignore\fP are always rooted.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8912
-Please see \%\fBhg help patterns\fP\: for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8913
+Please see \fBhg help patterns\fP for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8914
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8915
 .SH EXAMPLE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8916
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8917
@@ -113,7 +86,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8918
 Here is an example ignore file.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8919
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8920
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8921
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8922
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8923
 # use glob syntax.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8924
 syntax: glob
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8925
 
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8926
@@ -124,16 +97,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8927
 # switch to regexp syntax.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8928
 syntax: regexp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8929
 ^\e.pc/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8930
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8931
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8932
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8933
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8934
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8935
-Vadim Gelfer <\%[email protected]\:>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8936
+Vadim Gelfer <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8937
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8938
-Mercurial was written by Matt Mackall <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8939
+Mercurial was written by Matt Mackall <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8940
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8941
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8942
-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8943
+\fBhg\fP(1), \fBhgrc\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8944
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8945
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8946
 This manual page is copyright 2006 Vadim Gelfer.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8947
--- mercurial-3.0.1/doc/hgrc.5.orig	Sun Jun  1 14:15:48 2014
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8948
+++ mercurial-3.0.1/doc/hgrc.5	Fri Jun  6 10:48:16 2014
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8949
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8950
 .TH HGRC 5 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8951
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8952
 hgrc \- configuration files for Mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8953
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8954
-.nr rst2man-indent-level 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8955
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8956
-.de1 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8957
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8958
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8959
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8960
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8961
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8962
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8963
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8964
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8965
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8966
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8967
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8968
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8969
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8970
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8971
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8972
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8973
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8974
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8975
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8976
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8977
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8978
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8979
-..
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8980
 .SH DESCRIPTION
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8981
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8982
 The Mercurial system uses a set of configuration files to control
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8983
@@ -40,11 +13,11 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8984
 by \fBname = value\fP entries:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8985
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8986
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8987
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8988
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8989
 [ui]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8990
 username = Firstname Lastname <[email protected]>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8991
 verbose = True
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8992
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8993
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8994
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8995
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8996
 The above entries will be referred to as \fBui.username\fP and
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8997
@@ -54,8 +27,7 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8998
 Mercurial reads configuration data from several files, if they exist.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8999
 These files do not exist by default and you will have to create the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9000
 appropriate configuration files yourself: global configuration like
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9001
-the username setting is typically put into
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9002
-\fB%USERPROFILE%\emercurial.ini\fP or \fB$HOME/.hgrc\fP and local
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9003
+the username setting is typically put into \fB$HOME/.hgrc\fP and local
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9004
 configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9005
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9006
 The names of these files depend on the system on which Mercurial is
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9007
@@ -65,96 +37,50 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9008
 ones.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9009
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9010
 .nf
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9011
-(All) \fB<repo>/.hg/hgrc\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9012
+\fB<repo>/.hg/hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9013
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9014
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9015
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9016
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9017
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9018
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9019
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9020
 Per\-repository configuration options that only apply in a
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9021
 particular repository. This file is not version\-controlled, and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9022
 will not get transferred during a "clone" operation. Options in
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9023
-this file override options in all other configuration files. On
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9024
-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9025
+this file override options in all other configuration files.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9026
+Most of this file will be ignored if it doesn't
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9027
 belong to a trusted user or to a trusted group. See the documentation
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9028
 for the \fB[trusted]\fP section below for more details.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9029
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9030
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9031
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9032
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9033
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9034
 .nf
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9035
-(Plan 9) \fB$home/lib/hgrc\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9036
-(Unix) \fB$HOME/.hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9037
-(Windows) \fB%USERPROFILE%\e.hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9038
-(Windows) \fB%USERPROFILE%\eMercurial.ini\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9039
-(Windows) \fB%HOME%\e.hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9040
-(Windows) \fB%HOME%\eMercurial.ini\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9041
+\fB$HOME/.hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9042
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9043
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9044
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9045
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9046
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9047
+.RS 3
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9048
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9049
-Per\-user configuration file(s), for the user running Mercurial. On
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9050
-Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9051
-files apply to all Mercurial commands executed by this user in any
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9052
-directory. Options in these files override per\-system and per\-installation
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9053
+Per\-user configuration file, for the user running Mercurial. Options in this
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9054
+file apply to all Mercurial commands executed by this user in any
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9055
+directory. Options in this file override per\-system and per\-installation
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9056
 options.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9057
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9058
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9059
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9060
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9061
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9062
 .nf
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9063
-(Plan 9) \fB/lib/mercurial/hgrc\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9064
-(Plan 9) \fB/lib/mercurial/hgrc.d/*.rc\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9065
-(Unix) \fB/etc/mercurial/hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9066
-(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9067
+\fB/etc/mercurial/hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9068
+\fB/etc/mercurial/hgrc.d/*.rc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9069
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9070
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9071
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9072
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9073
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9074
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9075
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9076
 Per\-system configuration files, for the system on which Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9077
 is running. Options in these files apply to all Mercurial commands
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9078
 executed by any user in any directory. Options in these files
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9079
 override per\-installation options.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9080
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9081
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9082
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9083
-.nf
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9084
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9085
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9086
-(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9087
-(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9088
-.fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9089
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9090
-.INDENT 0.0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9091
-.INDENT 3.5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9092
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9093
-Per\-installation configuration files, searched for in the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9094
-directory where Mercurial is installed. \fB<install\-root>\fP is the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9095
-parent directory of the \fBhg\fP executable (or symlink) being run. For
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9096
-example, if installed in \fB/shared/tools/bin/hg\fP, Mercurial will look
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9097
-in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9098
-to all Mercurial commands executed by any user in any directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9099
-.UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9100
-.UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9101
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9102
-.nf
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9103
-(Windows) \fB<install\-dir>\eMercurial.ini\fP \fBor\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9104
-(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP \fBor\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9105
-(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9106
-.fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9107
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9108
-.INDENT 0.0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9109
-.INDENT 3.5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9110
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9111
-Per\-installation/system configuration files, for the system on
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9112
-which Mercurial is running. Options in these files apply to all
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9113
-Mercurial commands executed by any user in any directory. Registry
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9114
-keys contain PATH\-like strings, every part of which must reference
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9115
-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9116
-be read.  Mercurial checks each of these locations in the specified
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9117
-order until one or more configuration files are detected.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9118
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9119
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9120
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9121
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9122
 .IP Note
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9123
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9124
 The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9125
@@ -167,12 +93,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9126
 \fBconfiguration keys\fP):
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9127
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9128
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9129
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9130
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9131
 [spam]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9132
 eggs=ham
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9133
 green=
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9134
    eggs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9135
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9136
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9137
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9138
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9139
 Each line contains one entry. If the lines that follow are indented,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9140
@@ -184,12 +110,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9141
 will use the value that was configured last. As an example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9142
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9143
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9144
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9145
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9146
 [spam]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9147
 eggs=large
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9148
 ham=serrano
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9149
 eggs=small
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9150
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9151
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9152
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9153
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9154
 This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9155
@@ -199,7 +125,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9156
 example:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9157
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9158
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9159
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9160
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9161
 [foo]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9162
 eggs=large
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9163
 ham=serrano
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9164
@@ -214,7 +140,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9165
 ham=prosciutto
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9166
 eggs=medium
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9167
 bread=toasted
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9168
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9169
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9170
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9171
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9172
 This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9173
@@ -236,9 +162,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9174
 \fBfile\fP. This lets you do something like:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9175
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9176
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9177
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9178
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9179
 %include ~/.hgrc.d/$HOST.rc
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9180
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9181
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9182
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9183
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9184
 to include a different configuration file on each computer you use.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9185
@@ -255,9 +181,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9186
 placed in double quotation marks:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9187
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9188
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9189
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9190
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9191
 allow_read = "John Doe, PhD", brian, betty
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9192
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9193
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9194
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9195
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9196
 Quotation marks can be escaped by prefixing them with a backslash. Only
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9197
@@ -281,17 +207,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9198
 Alias definitions consist of lines of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9199
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9200
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9201
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9202
+.ft
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9203
 <alias> = <command> [<argument>]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9204
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9205
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9206
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9207
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9208
 For example, this definition:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9209
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9210
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9211
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9212
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9213
 latest = log \-\-limit 5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9214
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9215
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9216
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9217
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9218
 creates a new command \fBlatest\fP that shows only the five most recent
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9219
@@ -298,9 +224,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9220
 changesets. You can define subsequent aliases using earlier ones:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9221
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9222
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9223
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9224
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9225
 stable5 = latest \-b stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9226
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9227
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9228
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9229
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9230
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9231
@@ -314,9 +240,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9232
 run arbitrary commands. As an example,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9233
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9234
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9235
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9236
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9237
 echo = !echo $@
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9238
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9239
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9240
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9241
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9242
 will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9243
@@ -323,9 +249,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9244
 terminal. A better example might be:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9245
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9246
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9247
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9248
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9249
 purge = !$HG status \-\-no\-status \-\-unknown \-0 | xargs \-0 rm
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9250
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9251
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9252
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9253
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9254
 which will make \fBhg purge\fP delete all unknown files in the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9255
@@ -354,7 +280,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9256
 Settings used when displaying file annotations. All values are
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9257
 Booleans and default to False. See \fBdiff\fP section for related
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9258
 options for the diff command.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9259
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9260
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9261
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9262
 .B \fBignorews\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9263
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9264
@@ -367,7 +293,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9265
 .B \fBignoreblanklines\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9266
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9267
 Ignore changes whose lines are all blank.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9268
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9269
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9270
 .SS \fBauth\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9271
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9272
 Authentication credentials for HTTP authentication. This section
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9273
@@ -378,9 +304,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9274
 Each line has the following format:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9275
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9276
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9277
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9278
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9279
 <name>.<argument> = <value>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9280
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9281
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9282
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9283
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9284
 where \fB<name>\fP is used to group arguments into authentication
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9285
@@ -387,7 +313,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9286
 entries. Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9287
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9288
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9289
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9290
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9291
 foo.prefix = hg.intevation.org/mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9292
 foo.username = foo
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9293
 foo.password = bar
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9294
@@ -397,11 +323,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9295
 bar.key = path/to/file.key
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9296
 bar.cert = path/to/file.cert
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9297
 bar.schemes = https
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9298
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9299
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9300
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9301
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9302
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9303
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9304
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9305
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9306
 .B \fBprefix\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9307
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9308
@@ -408,7 +334,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9309
 Either \fB*\fP or a URI prefix with or without the scheme part.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9310
 The authentication entry with the longest matching prefix is used
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9311
 (where \fB*\fP matches everything and counts as a match of length
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9312
-1). If the prefix doesn\(aqt include a scheme, the match is performed
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9313
+1). If the prefix doesn't include a scheme, the match is performed
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9314
 against the URI with its scheme stripped as well, and the schemes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9315
 argument, q.v., is then subsequently consulted.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9316
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9317
@@ -440,11 +366,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9318
 .B \fBschemes\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9319
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9320
 Optional. Space separated list of URI schemes to use this
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9321
-authentication entry with. Only used if the prefix doesn\(aqt include
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9322
+authentication entry with. Only used if the prefix doesn't include
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9323
 a scheme. Supported schemes are http and https. They will match
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9324
 static\-http and static\-https respectively, as well.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9325
 Default: https.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9326
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9327
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9328
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9329
 If no suitable authentication entry is found, the user is prompted
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9330
 for credentials as usual if required by the remote.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9331
@@ -470,7 +396,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9332
 Pipe example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9333
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9334
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9335
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9336
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9337
 [encode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9338
 # uncompress gzip files on checkin to improve delta compression
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9339
 # note: not necessarily a good idea, just an example
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9340
@@ -478,9 +404,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9341
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9342
 [decode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9343
 # recompress gzip files when writing them to the working dir (we
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9344
-# can safely omit "pipe:", because it\(aqs the default)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9345
+# can safely omit "pipe:", because it's the default)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9346
 *.gz = gzip
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9347
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9348
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9349
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9350
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9351
 A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9352
@@ -488,12 +414,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9353
 filtered by the command. The string \fBOUTFILE\fP is replaced with the name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9354
 of an empty temporary file, where the filtered data must be written by
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9355
 the command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9356
-.IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9357
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9358
-The tempfile mechanism is recommended for Windows systems,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9359
-where the standard shell I/O redirection operators often have
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9360
-strange effects and may corrupt the contents of your files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9361
-.RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9362
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9363
 This filter mechanism is used internally by the \fBeol\fP extension to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9364
 translate line ending characters between Windows (CRLF) and Unix (LF)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9365
@@ -500,20 +420,20 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9366
 format. We suggest you use the \fBeol\fP extension for convenience.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9367
 .SS \fBdefaults\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9368
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9369
-(defaults are deprecated. Don\(aqt use them. Use aliases instead)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9370
+(defaults are deprecated. Don't use them. Use aliases instead)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9371
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9372
 Use the \fB[defaults]\fP section to define command defaults, i.e. the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9373
 default options/arguments to pass to the specified commands.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9374
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9375
-The following example makes \%\fBhg log\fP\: run in verbose mode, and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9376
-\%\fBhg status\fP\: show only the modified files, by default:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9377
+The following example makes \fBhg log\fP run in verbose mode, and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9378
+\fBhg status\fP show only the modified files, by default:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9379
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9380
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9381
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9382
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9383
 [defaults]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9384
 log = \-v
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9385
 status = \-m
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9386
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9387
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9388
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9389
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9390
 The actual commands, instead of their aliases, must be used when
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9391
@@ -524,7 +444,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9392
 Settings used when displaying diffs. Everything except for \fBunified\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9393
 is a Boolean and defaults to False. See \fBannotate\fP section for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9394
 related options for the annotate command.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9395
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9396
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9397
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9398
 .B \fBgit\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9399
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9400
@@ -532,7 +452,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9401
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9402
 .B \fBnodates\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9403
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9404
-Don\(aqt include dates in diff headers.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9405
+Don't include dates in diff headers.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9406
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9407
 .B \fBshowfunc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9408
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9409
@@ -553,11 +473,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9410
 .B \fBunified\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9411
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9412
 Number of lines of context to show.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9413
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9414
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9415
 .SS \fBemail\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9416
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9417
 Settings for extensions that send email messages.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9418
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9419
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9420
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9421
 .B \fBfrom\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9422
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9423
@@ -566,16 +486,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9424
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9425
 .B \fBto\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9426
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9427
-Optional. Comma\-separated list of recipients\(aq email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9428
+Optional. Comma\-separated list of recipients' email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9429
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9430
 .B \fBcc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9431
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9432
-Optional. Comma\-separated list of carbon copy recipients\(aq
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9433
+Optional. Comma\-separated list of carbon copy recipients'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9434
 email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9435
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9436
 .B \fBbcc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9437
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9438
-Optional. Comma\-separated list of blind carbon copy recipients\(aq
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9439
+Optional. Comma\-separated list of blind carbon copy recipients'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9440
 email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9441
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9442
 .B \fBmethod\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9443
@@ -598,7 +518,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9444
 empty (explicit) list.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9445
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9446
 Order of outgoing email character sets:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9447
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9448
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9449
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9450
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9451
 \fBus\-ascii\fP: always first, regardless of settings
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9452
@@ -614,13 +534,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9453
 .IP 5. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9454
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9455
 \fButf\-8\fP: always last, regardless of settings
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9456
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9457
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9458
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9459
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9460
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9461
 Email example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9462
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9463
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9464
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9465
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9466
 [email]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9467
 from = Joseph User <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9468
 method = /usr/sbin/sendmail
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9469
@@ -627,7 +547,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9470
 # charsets for western Europeans
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9471
 # us\-ascii, utf\-8 omitted, as they are tried first and last
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9472
 charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9473
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9474
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9475
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9476
 .SS \fBextensions\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9477
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9478
@@ -634,7 +554,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9479
 Mercurial has an extension mechanism for adding new features. To
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9480
 enable an extension, create an entry for it in this section.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9481
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9482
-If you know that the extension is already in Python\(aqs search path,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9483
+If you know that the extension is already in Python's search path,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9484
 you can give the name of the module, followed by \fB=\fP, with nothing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9485
 after the \fB=\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9486
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9487
@@ -649,16 +569,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9488
 Example for \fB~/.hgrc\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9489
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9490
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9491
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9492
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9493
 [extensions]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9494
-# (the progress extension will get loaded from Mercurial\(aqs path)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9495
+# (the progress extension will get loaded from Mercurial's path)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9496
 progress =
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9497
 # (this extension will get loaded from the file specified)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9498
 myfeature = ~/.hgext/myfeature.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9499
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9500
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9501
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9502
 .SS \fBformat\fP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9503
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9504
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9505
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9506
 .B \fBusestore\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9507
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9508
@@ -686,7 +606,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9509
 Mac OS X and spaces on Windows. Enabled by default. Disabling this
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9510
 option ensures that the on\-disk format of newly created
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9511
 repositories will be compatible with Mercurial before version 1.7.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9512
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9513
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9514
 .SS \fBgraph\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9515
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9516
 Web graph view configuration. This section let you change graph
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9517
@@ -696,9 +616,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9518
 Each line has the following format:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9519
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9520
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9521
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9522
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9523
 <branch>.<argument> = <value>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9524
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9525
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9526
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9527
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9528
 where \fB<branch>\fP is the name of the branch being
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9529
@@ -705,17 +625,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9530
 customized. Example:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9531
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9532
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9533
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9534
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9535
 [graph]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9536
 # 2px width
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9537
 default.width = 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9538
 # red color
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9539
 default.color = FF0000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9540
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9541
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9542
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9543
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9544
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9545
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9546
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9547
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9548
 .B \fBwidth\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9549
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9550
@@ -724,7 +644,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9551
 .B \fBcolor\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9552
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9553
 Set branch edges color in hexadecimal RGB notation.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9554
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9555
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9556
 .SS \fBhooks\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9557
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9558
 Commands or Python functions that get automatically executed by
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9559
@@ -739,7 +659,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9560
 Example \fB.hg/hgrc\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9561
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9562
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9563
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9564
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9565
 [hooks]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9566
 # update working directory after adding changesets
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9567
 changegroup.update = hg update
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9568
@@ -749,13 +669,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9569
 incoming.autobuild = /my/build/hook
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9570
 # force autobuild hook to run before other incoming hooks
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9571
 priority.incoming.autobuild = 1
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9572
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9573
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9574
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9575
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9576
 Most hooks are run with environment variables set that give useful
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9577
 additional information. For each hook below, the environment
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9578
 variables it is passed are listed with names of the form \fB$HG_foo\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9579
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9580
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9581
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9582
 .B \fBchangegroup\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9583
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9584
@@ -799,7 +719,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9585
 representations of the data internally passed to <command>. \fB$HG_OPTS\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9586
 is a  dictionary of options (with unspecified options set to their
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9587
 defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9588
-failure, the command doesn\(aqt execute and Mercurial returns the failure
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9589
+failure, the command doesn't execute and Mercurial returns the failure
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9590
 code.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9591
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9592
 .B \fBprechangegroup\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9593
@@ -899,7 +819,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9594
 new parent is in \fB$HG_PARENT1\fP. If merge, ID of second new parent is
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9595
 in \fB$HG_PARENT2\fP. If the update succeeded, \fB$HG_ERROR=0\fP. If the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9596
 update failed (e.g. because conflicts not resolved), \fB$HG_ERROR=1\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9597
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9598
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9599
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9600
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9601
 It is generally better to use standard hooks rather than the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9602
@@ -908,21 +828,14 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9603
 Also, hooks like "commit" will be called in all contexts that
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9604
 generate a commit (e.g. tag) and not just the commit command.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9605
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9606
-.IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9607
-.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9608
-Environment variables with empty values may not be passed to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9609
-hooks on platforms such as Windows. As an example, \fB$HG_PARENT2\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9610
-will have an empty value under Unix\-like platforms for non\-merge
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9611
-changesets, while it will not be available at all under Windows.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9612
-.RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9613
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9614
 The syntax for Python hooks is as follows:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9615
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9616
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9617
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9618
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9619
 hookname = python:modulename.submodule.callable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9620
 hookname = python:/path/to/python/module.py:callable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9621
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9622
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9623
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9624
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9625
 Python hooks are run within the Mercurial process. Each hook is
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9626
@@ -946,10 +859,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9627
 For example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9628
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9629
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9630
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9631
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9632
 [hostfingerprints]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9633
 hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9634
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9635
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9636
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9637
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9638
 This feature is only supported when using Python 2.6 or later.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9639
@@ -957,7 +870,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9640
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9641
 Used to access web\-based Mercurial repositories through a HTTP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9642
 proxy.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9643
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9644
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9645
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9646
 .B \fBhost\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9647
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9648
@@ -981,7 +894,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9649
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9650
 Optional. Always use the proxy, even for localhost and any entries
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9651
 in \fBhttp_proxy.no\fP. True or False. Default: False.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9652
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9653
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9654
 .SS \fBmerge\-patterns\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9655
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9656
 This section specifies merge tools to associate with particular file
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9657
@@ -992,11 +905,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9658
 Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9659
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9660
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9661
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9662
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9663
 [merge\-patterns]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9664
 **.c = kdiff3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9665
 **.jpg = myimgmerge
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9666
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9667
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9668
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9669
 .SS \fBmerge\-tools\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9670
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9671
@@ -1006,7 +919,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9672
 Example \fB~/.hgrc\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9673
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9674
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9675
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9676
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9677
 [merge\-tools]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9678
 # Override stock tool location
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9679
 kdiff3.executable = ~/bin/kdiff3
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9680
@@ -1017,13 +930,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9681
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9682
 # Define new tool
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9683
 myHtmlTool.args = \-m $local $other $base $output
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9684
-myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9685
 myHtmlTool.priority = 1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9686
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9687
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9688
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9689
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9690
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9691
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9692
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9693
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9694
 .B \fBpriority\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9695
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9696
@@ -1032,9 +944,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9697
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9698
 .B \fBexecutable\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9699
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9700
-Either just the name of the executable or its pathname.  On Windows,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9701
-the path can use environment variables with ${ProgramFiles} syntax.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9702
-Default: the tool name.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9703
+Either just the name of the executable or its pathname.  Default: the tool name.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9704
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9705
 .B \fBargs\fP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9706
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9707
@@ -1063,7 +973,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9708
 .B \fBcheck\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9709
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9710
 A list of merge success\-checking options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9711
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9712
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9713
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9714
 .B \fBchanged\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9715
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9716
@@ -1076,7 +986,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9717
 .B \fBprompt\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9718
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9719
 Always prompt for merge success, regardless of success reported by tool.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9720
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9721
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9722
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9723
 .B \fBfixeol\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9724
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9725
@@ -1086,42 +996,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9726
 .B \fBgui\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9727
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9728
 This tool requires a graphical interface to run. Default: False
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9729
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9730
-.B \fBregkey\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9731
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9732
-Windows registry key which describes install location of this
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9733
-tool. Mercurial will search for this key first under
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9734
-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9735
-Default: None
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9736
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9737
-.B \fBregkeyalt\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9738
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9739
-An alternate Windows registry key to try if the first key is not
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9740
-found.  The alternate key uses the same \fBregname\fP and \fBregappend\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9741
-semantics of the primary key.  The most common use for this key
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9742
-is to search for 32bit applications on 64bit operating systems.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9743
-Default: None
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9744
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9745
-.B \fBregname\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9746
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9747
-Name of value to read from specified registry key. Defaults to the
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9748
-unnamed (default) value.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9749
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9750
-.B \fBregappend\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9751
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9752
-String to append to the value read from the registry, typically
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9753
-the executable name of the tool.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9754
-Default: None
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9755
-.UNINDENT
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9756
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9757
 .SS \fBpatch\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9758
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9759
-Settings used when applying patches, for instance through the \(aqimport\(aq
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9760
+Settings used when applying patches, for instance through the 'import'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9761
 command or with Mercurial Queues extension.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9762
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9763
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9764
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9765
 .B \fBeol\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9766
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9767
-When set to \(aqstrict\(aq patch content and patched files end of lines
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9768
+When set to 'strict' patch content and patched files end of lines
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9769
 are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9770
 lines are ignored when patching and the result line endings are
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9771
 normalized to either LF (Unix) or CRLF (Windows). When set to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9772
@@ -1130,7 +1014,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9773
 on a per\-file basis. If target file does not exist or has no end
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9774
 of line, patch line endings are preserved.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9775
 Default: strict.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9776
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9777
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9778
 .SS \fBpaths\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9779
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9780
 Assigns symbolic names to repositories. The left side is the
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9781
@@ -1137,7 +1021,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9782
 symbolic name, and the right gives the directory or URL that is the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9783
 location of the repository. Default paths can be declared by setting
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9784
 the following entries.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9785
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9786
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9787
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9788
 .B \fBdefault\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9789
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9790
@@ -1149,30 +1033,30 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9791
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9792
 Optional. Directory or URL to use when pushing if no destination
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9793
 is specified.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9794
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9795
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9796
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9797
 Custom paths can be defined by assigning the path to a name that later can be
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9798
 used from the command line. Example:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9799
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9800
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9801
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9802
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9803
 [paths]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9804
 my_path = http://example.com/path
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9805
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9806
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9807
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9808
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9809
 To push to the path defined in \fBmy_path\fP run the command:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9810
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9811
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9812
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9813
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9814
 hg push my_path
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9815
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9816
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9817
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9818
 .SS \fBphases\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9819
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9820
-Specifies default handling of phases. See \%\fBhg help phases\fP\: for more
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9821
+Specifies default handling of phases. See \fBhg help phases\fP for more
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9822
 information about working with phases.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9823
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9824
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9825
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9826
 .B \fBpublish\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9827
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9828
@@ -1197,7 +1081,7 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9829
 either aborted (if checksubrepos is set to "abort") or the higher phase is
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9830
 used for the parent repository commit (if set to "follow").
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9831
 Default: "follow"
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9832
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9833
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9834
 .SS \fBprofiling\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9835
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9836
 Specifies profiling type, format, and file output. Two profilers are
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9837
@@ -1204,21 +1088,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9838
 supported: an instrumenting profiler (named \fBls\fP), and a sampling
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9839
 profiler (named \fBstat\fP).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9840
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9841
-In this section description, \(aqprofiling data\(aq stands for the raw data
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9842
-collected during profiling, while \(aqprofiling report\(aq stands for a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9843
+In this section description, 'profiling data' stands for the raw data
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9844
+collected during profiling, while 'profiling report' stands for a
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9845
 statistical text report generated from the profiling data. The
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9846
 profiling is done using lsprof.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9847
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9848
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9849
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9850
 .B \fBtype\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9851
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9852
 The type of profiler to use.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9853
 Default: ls.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9854
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9855
+.RS 7
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9856
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9857
 .B \fBls\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9858
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9859
-Use Python\(aqs built\-in instrumenting profiler. This profiler
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9860
+Use Python's built\-in instrumenting profiler. This profiler
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9861
 works on all platforms, but each line number it reports is the
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9862
 first line of a function. This restriction makes it difficult to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9863
 identify the expensive parts of a non\-trivial function.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9864
@@ -1228,13 +1112,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9865
 Use a third\-party statistical profiler, statprof. This profiler
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9866
 currently runs only on Unix systems, and is most useful for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9867
 profiling commands that run for longer than about 0.1 seconds.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9868
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9869
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9870
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9871
 .B \fBformat\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9872
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9873
 Profiling format.  Specific to the \fBls\fP instrumenting profiler.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9874
 Default: text.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9875
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9876
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9877
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9878
 .B \fBtext\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9879
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9880
@@ -1247,7 +1131,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9881
 Format profiling data for kcachegrind use: when saving to a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9882
 file, the generated file can directly be loaded into
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9883
 kcachegrind.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9884
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9885
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9886
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9887
 .B \fBfrequency\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9888
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9889
@@ -1278,14 +1162,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9890
 This can help explain the difference between Total and Inline.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9891
 Specific to the \fBls\fP instrumenting profiler.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9892
 Default: 5.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9893
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9894
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9895
 .SS \fBrevsetalias\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9896
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9897
-Alias definitions for revsets. See \%\fBhg help revsets\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9898
+Alias definitions for revsets. See \fBhg help revsets\fP for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9899
 .SS \fBserver\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9900
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9901
 Controls generic server settings.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9902
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9903
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9904
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9905
 .B \fBuncompressed\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9906
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9907
@@ -1310,11 +1194,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9908
 Whether to validate the completeness of pushed changesets by
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9909
 checking that all new file revisions specified in manifests are
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9910
 present. Default is False.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9911
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9912
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9913
 .SS \fBsmtp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9914
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9915
 Configuration for extensions that need to send email messages.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9916
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9917
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9918
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9919
 .B \fBhost\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9920
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9921
@@ -1339,7 +1223,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9922
 \fB[web] cacerts\fP also). For "strict", sending email is also
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9923
 aborted, if there is no configuration for mail server in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9924
 \fB[hostfingerprints]\fP and \fB[web] cacerts\fP.  \-\-insecure for
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9925
-\%\fBhg email\fP\: overwrites this as "loose". Default: "strict".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9926
+\fBhg email\fP overwrites this as "loose". Default: "strict".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9927
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9928
 .B \fBusername\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9929
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9930
@@ -1354,9 +1238,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9931
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9932
 .B \fBlocal_hostname\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9933
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9934
-Optional. It\(aqs the hostname that the sender can use to identify
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9935
+Optional. It's the hostname that the sender can use to identify
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9936
 itself to the MTA.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9937
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9938
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9939
 .SS \fBsubpaths\fP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9940
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9941
 Subrepository source URLs can go stale if a remote server changes name
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9942
@@ -1364,9 +1248,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9943
 rewrite rules of the form:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9944
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9945
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9946
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9947
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9948
 <pattern> = <replacement>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9949
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9950
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9951
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9952
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9953
 where \fBpattern\fP is a regular expression matching a subrepository
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9954
@@ -1375,9 +1259,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9955
 \fBreplacements\fP. For instance:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9956
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9957
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9958
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9959
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9960
 http://server/(.*)\-hg/ = http://hg.server/\e1/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9961
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9962
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9963
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9964
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9965
 rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9966
@@ -1388,7 +1272,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9967
 .SS \fBtrusted\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9968
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9969
 Mercurial will not use the settings in the
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9970
-\fB.hg/hgrc\fP file from a repository if it doesn\(aqt belong to a trusted
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9971
+\fB\&.hg/hgrc\fP file from a repository if it doesn't belong to a trusted
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9972
 user or to a trusted group, as various hgrc features allow arbitrary
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9973
 commands to be run. This issue is often encountered when configuring
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9974
 hooks or extensions for shared repositories or servers. However,
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9975
@@ -1400,7 +1284,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9976
 group with name \fB*\fP. These settings must be placed in an
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9977
 \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9978
 user or service running Mercurial.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9979
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9980
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9981
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9982
 .B \fBusers\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9983
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9984
@@ -1409,17 +1293,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9985
 .B \fBgroups\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9986
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9987
 Comma\-separated list of trusted groups.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9988
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9989
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9990
 .SS \fBui\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9991
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9992
 User interface controls.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9993
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9994
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9995
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9996
 .B \fBarchivemeta\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9997
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9998
 Whether to include the .hg_archival.txt file containing meta data
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9999
 (hashes for the repository base and for tip) in archives created
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10000
-by the \%\fBhg archive\fP\: command or downloaded via hgweb.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10001
+by the \fBhg archive\fP command or downloaded via hgweb.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10002
 Default is True.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10003
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10004
 .B \fBaskusername\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10005
@@ -1447,7 +1331,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10006
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10007
 .B \fBfallbackencoding\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10008
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10009
-Encoding to try if it\(aqs not possible to decode the changelog using
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10010
+Encoding to try if it's not possible to decode the changelog using
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10011
 UTF\-8. Default is ISO\-8859\-1.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10012
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10013
 .B \fBignore\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10014
@@ -1470,7 +1354,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10015
 .B \fBmerge\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10016
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10017
 The conflict resolution program to use during a manual merge.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10018
-For more information on merge tools see \%\fBhg help merge\-tools\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10019
+For more information on merge tools see \fBhg help merge\-tools\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10020
 For configuring merge tools see the \fB[merge\-tools]\fP section.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10021
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10022
 .B \fBportablefilenames\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10023
@@ -1479,7 +1363,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10024
 Default is \fBwarn\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10025
 If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10026
 platforms, if a file with a non\-portable filename is added (e.g. a file
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10027
-with a name that can\(aqt be created on Windows because it contains reserved
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10028
+with a name that can't be created on Windows because it contains reserved
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10029
 parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10030
 collision with an existing file).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10031
 If set to \fBignore\fP (or \fBfalse\fP), no warning is printed.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10032
@@ -1540,7 +1424,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10033
 .B \fBusername\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10034
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10035
 The committer of a changeset created when running "commit".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10036
-Typically a person\(aqs name and email address, e.g. \fBFred Widget
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10037
+Typically a person's name and email address, e.g. \fBFred Widget
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10038
 <[email protected]>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10039
 the username in hgrc is empty, it has to be specified manually or
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10040
 in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10041
@@ -1550,11 +1434,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10042
 .B \fBverbose\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10043
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10044
 Increase the amount of output printed. True or False. Default is False.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10045
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10046
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10047
 .SS \fBweb\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10048
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10049
 Web interface configuration. The settings in this section apply to
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10050
-both the builtin webserver (started by \%\fBhg serve\fP\:) and the script you
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10051
+both the builtin webserver (started by \fBhg serve\fP) and the script you
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10052
 run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10053
 and WSGI).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10054
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10055
@@ -1570,9 +1454,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10056
 command line:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10057
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10058
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10059
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10060
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10061
 $ hg \-\-config web.allow_push=* \-\-config web.push_ssl=False serve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10062
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10063
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10064
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10065
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10066
 Note that this will allow anybody to push anything to the server and
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10067
@@ -1579,7 +1463,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10068
 that this should not be used for public servers.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10069
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10070
 The full set of options is:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10071
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10072
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10073
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10074
 .B \fBaccesslog\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10075
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10076
@@ -1663,13 +1547,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10077
 To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10078
 command line.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10079
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10080
-You can use OpenSSL\(aqs CA certificate file if your platform has
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10081
+You can use OpenSSL's CA certificate file if your platform has
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10082
 one. On most Linux systems this will be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10083
 \fB/etc/ssl/certs/ca\-certificates.crt\fP. Otherwise you will have to
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10084
 generate this file manually. The form must be as follows:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10085
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10086
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10087
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10088
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10089
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10090
 \&... (certificate in base64 PEM encoding) ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10091
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10092
@@ -1676,7 +1560,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10093
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10094
 \&... (certificate in base64 PEM encoding) ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10095
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10096
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10097
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10098
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10099
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10100
 .B \fBcache\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10101
@@ -1737,7 +1621,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10102
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10103
 .B \fBdescription\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10104
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10105
-Textual description of the repository\(aqs purpose or contents.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10106
+Textual description of the repository's purpose or contents.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10107
 Default is "unknown".
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10108
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10109
 .B \fBencoding\fP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10110
@@ -1802,7 +1686,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10111
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10112
 .B \fBprefix\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10113
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10114
-Prefix path to serve from. Default is \(aq\(aq (server root).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10115
+Prefix path to serve from. Default is '' (server root).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10116
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10117
 .B \fBpush_ssl\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10118
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10119
@@ -1828,7 +1712,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10120
 .B \fBtemplates\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10121
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10122
 Where to find the HTML templates. Default is install path.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10123
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10124
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10125
 .SS \fBwebsub\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10126
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10127
 Web substitution filter definition. You can use this section to
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10128
@@ -1850,9 +1734,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10129
 which in turn imitates the Unix sed replacement syntax:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10130
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10131
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10132
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10133
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10134
 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10135
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10136
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10137
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10138
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10139
 You can use any separator other than "/". The final "i" is optional
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10140
@@ -1861,12 +1745,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10141
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10142
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10143
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10144
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10145
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10146
 [websub]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10147
 issues = s|issue(\ed+)|<a href="http://bts.example.org/issue\e1">issue\e1</a>|i
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10148
 italic = s/\eb_(\eS+)_\eb/<i>\e1<\e/i>/
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10149
 bold = s/\e*\eb(\eS+)\eb\e*/<b>\e1<\e/b>/
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10150
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10151
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10152
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10153
 .SS \fBworker\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10154
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10155
@@ -1873,7 +1757,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10156
 Parallel master/worker configuration. We currently perform working
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10157
 directory updates in parallel on Unix\-like systems, which greatly
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10158
 helps performance.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10159
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10160
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10161
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10162
 .B \fBnumcpus\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10163
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10164
@@ -1880,18 +1764,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10165
 Number of CPUs to use for parallel operations. Default is 4 or the
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10166
 number of CPUs on the system, whichever is larger. A zero or
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10167
 negative value is treated as \fBuse the default\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10168
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10169
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10170
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10171
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10172
-Bryan O\(aqSullivan <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10173
+Bryan O'Sullivan <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10174
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10175
-Mercurial was written by Matt Mackall <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10176
+Mercurial was written by Matt Mackall <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10177
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10178
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10179
-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10180
+\fBhg\fP(1), \fBhgignore\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10181
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10182
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10183
-This manual page is copyright 2005 Bryan O\(aqSullivan.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10184
+This manual page is copyright 2005 Bryan O'Sullivan.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10185
 Mercurial is copyright 2005\-2014 Matt Mackall.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10186
 Free use of this software is granted under the terms of the GNU General
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10187
 Public License version 2 or any later version.