components/mercurial/patches/manpages.patch
author Danek Duvall <danek.duvall@oracle.com>
Mon, 22 Feb 2016 14:29:22 -0800
changeset 5481 5e30cd0645e7
parent 4263 078df530ebdb
child 5683 05b2186d572e
permissions -rw-r--r--
21549200 mercurial 3.7.1 21368629 hg diff is not interruptible
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     1
This patch is autogenerated by a rule in the userland Makefile for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     2
mercurial.  We already patch a handful of help files (via rst.patch), and
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     3
change the rst plugin to emit manpages intelligible to Solaris nroff (via
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     4
hgmanpage.patch), but docutils is required to actually rebuild the manpages
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     5
after those changes are made.  Since we don't yet ship docutils, we have to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     6
create this patch offline and keep a copy of it in the repo.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     7
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     8
These changes are Solaris-specific and not appropriate for upstream.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
     9
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
    10
--- mercurial-3.7.1/doc/hg.1.orig	Wed Feb  3 14:00:04 2016
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
    11
+++ mercurial-3.7.1/doc/hg.1	Thu Feb  4 10:13:50 2016
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    12
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    13
 .TH HG 1 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    14
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    15
 hg \- Mercurial source code management system
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    16
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    17
-.nr rst2man-indent-level 0
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 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    20
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    21
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    22
-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
    23
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    24
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    25
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    26
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    27
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    28
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    29
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    30
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    31
-. 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
    32
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    33
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    34
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    35
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    36
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    37
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    38
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    39
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    40
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    41
-.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
    42
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    43
 .SH SYNOPSIS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    44
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    45
 \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
    46
@@ -38,12 +11,12 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    47
 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
    48
 system.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    49
 .SH COMMAND ELEMENTS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    50
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    51
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    52
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    53
 .B files...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    54
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    55
 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
    56
-\%File Name Patterns\: for information on pattern matching
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    57
+File Name Patterns for information on pattern matching
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    58
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    59
 .B path
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    60
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    61
@@ -59,9 +32,9 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    62
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    63
 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
    64
 repository.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    65
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    66
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    67
 .SH OPTIONS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    68
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    69
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    70
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    71
 .BI \-R,  \-\-repository \ <REPO>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    72
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    73
@@ -85,7 +58,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    74
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    75
 .BI \-\-config \ <CONFIG[+]>
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    76
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    77
-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
    78
+set/override config option (use 'section.name=value')
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    79
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    80
 .B \-\-debug
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    81
 .
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    82
@@ -126,7 +99,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    83
 .B \-\-hidden
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    84
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    85
 consider hidden changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    86
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    87
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    88
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    89
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
    90
 .SH COMMANDS
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    91
@@ -135,9 +108,9 @@
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
    92
 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
    93
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    94
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    95
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    96
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    97
 hg add [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    98
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
    99
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   100
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   101
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   102
 Schedule files to be version controlled and added to the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   103
@@ -144,22 +117,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   104
 repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   105
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   106
 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
   107
-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
   108
+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
   109
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   110
 If no names are given, add all files to the repository (except
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   111
 files matching \fB.hgignore\fP).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   112
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   113
 Examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   114
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   115
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   116
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   117
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   118
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   119
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   120
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   121
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   122
 New (unknown) files are added
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   123
-automatically by \%\fBhg add\fP\::
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   124
+automatically by \fBhg add\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   125
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   126
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   127
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   128
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   129
 $ ls
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   130
 foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   131
 $ hg status
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   132
@@ -168,7 +141,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   133
 adding foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   134
 $ hg status
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   135
 A foo.c
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   136
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   137
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   138
 .fi
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   139
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   140
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   141
@@ -175,7 +148,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   142
 Specific files to be added can be specified:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   143
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   144
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   145
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   146
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   147
 $ ls
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   148
 bar.c  foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   149
 $ hg status
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   150
@@ -185,16 +158,16 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   151
 $ hg status
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   152
 A bar.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   153
 ? foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   154
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   155
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   156
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   157
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   158
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   159
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   160
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   161
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   162
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   163
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   164
 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
   165
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   166
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   167
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   168
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   169
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   170
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   171
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   172
@@ -211,7 +184,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   173
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   174
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   175
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   176
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   177
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   178
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   179
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   180
 .SS addremove
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   181
@@ -219,9 +192,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   182
 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
   183
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   184
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   185
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   186
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   187
 hg addremove [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   188
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   189
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   190
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   191
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   192
 Add all new files and remove all missing files from the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   193
@@ -236,23 +209,23 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   194
 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
   195
 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
   196
 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
   197
-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
   198
+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
   199
 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
   200
 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
   201
 identical files are detected.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   202
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   203
 Examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   204
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   205
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   206
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   207
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   208
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   209
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   210
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   211
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   212
 A number of files (bar.c and foo.c) are new,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   213
-while foobar.c has been removed (without using \%\fBhg remove\fP\:)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   214
+while foobar.c has been removed (without using \fBhg remove\fP)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   215
 from the repository:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   216
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   217
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   218
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   219
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   220
 $ ls
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   221
 bar.c foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   222
 $ hg status
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   223
@@ -267,15 +240,15 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   224
 A bar.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   225
 A foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   226
 R foobar.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   227
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   228
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   229
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   230
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   231
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   232
-A file foobar.c was moved to foo.c without using \%\fBhg rename\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   233
+A file foobar.c was moved to foo.c without using \fBhg rename\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   234
 Afterwards, it was edited slightly:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   235
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   236
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   237
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   238
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   239
 $ ls
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   240
 foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   241
 $ hg status
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   242
@@ -289,16 +262,16 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   243
 A foo.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   244
   foobar.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   245
 R foobar.c
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   246
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   247
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   248
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   249
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   250
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   251
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   252
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   253
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   254
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   255
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   256
 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
   257
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   258
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   259
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   260
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   261
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   262
 .BI \-s,  \-\-similarity \ <SIMILARITY>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   263
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   264
@@ -319,7 +292,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   265
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   266
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   267
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   268
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   269
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   270
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   271
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   272
 .SS annotate
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   273
@@ -327,9 +300,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   274
 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
   275
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   276
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   277
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   278
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   279
 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
   280
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   281
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   282
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   283
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   284
 List changes in files, showing the revision id responsible for
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   285
@@ -349,7 +322,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   286
 Returns 0 on success.
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
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   289
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   290
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   291
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   292
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   293
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   294
@@ -361,7 +334,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   295
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   296
 .B \-\-no\-follow
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   297
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   298
-don\(aqt follow copies and renames
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   299
+don't follow copies and renames
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   300
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   301
 .B \-a,  \-\-text
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   302
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   303
@@ -414,23 +387,23 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   304
 .BI \-T,  \-\-template \ <TEMPLATE>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   305
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   306
 display with template (EXPERIMENTAL)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   307
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   308
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   309
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   310
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   311
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   312
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   313
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   314
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   315
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   316
 aliases: blame
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   317
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   318
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   319
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   320
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   321
 .SS archive
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   322
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   323
 create an unversioned archive of a repository revision:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   324
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   325
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   326
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   327
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   328
 hg archive [OPTION]... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   329
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   330
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   331
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   332
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   333
 By default, the revision used is the parent of the working
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   334
@@ -440,15 +413,15 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   335
 extension (to override, use \-t/\-\-type).
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   336
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   337
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   338
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   339
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   340
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   341
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   342
 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
   343
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   344
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   345
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   346
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   347
 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
   348
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   349
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   350
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   351
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   352
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   353
@@ -455,14 +428,14 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   354
 create a tarball excluding .hg files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   355
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   356
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   357
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   358
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   359
 hg archive project.tar.gz \-X ".hg*"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   360
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   361
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   362
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   363
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   364
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   365
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   366
 Valid types are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   367
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   368
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   369
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   370
 .B \fBfiles\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   371
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   372
@@ -487,10 +460,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   373
 .B \fBzip\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   374
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   375
 zip archive, compressed using deflate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   376
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   377
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   378
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   379
 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
   380
-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
   381
+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
   382
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   383
 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
   384
 prepended. Use \-p/\-\-prefix to specify a format string for the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   385
@@ -500,7 +473,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   386
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   387
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   388
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   389
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   390
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   391
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   392
 .B \-\-no\-decode
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   393
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   394
@@ -529,7 +502,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   395
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   396
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   397
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   398
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   399
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   400
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   401
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   402
 .SS backout
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   403
@@ -537,9 +510,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   404
 reverse effect of earlier changeset:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   405
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   406
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   407
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   408
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   409
 hg backout [OPTION]... [\-r] REV
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   410
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   411
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   412
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   413
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   414
 Prepare a new changeset with the effect of REV undone in the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   415
@@ -550,12 +523,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   416
 is committed automatically (unless \-\-no\-commit is specified).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   417
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   418
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   419
-\%\fBhg backout\fP\: cannot be used to fix either an unwanted or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   420
+\fBhg backout\fP cannot be used to fix either an unwanted or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   421
 incorrect merge.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   422
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   423
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   424
 Examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   425
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   426
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   427
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   428
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   429
 Reverse the effect of the parent of the working directory.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   430
@@ -562,9 +535,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   431
 This backout will be committed immediately:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   432
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   433
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   434
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   435
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   436
 hg backout \-r .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   437
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   438
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   439
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   440
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   441
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   442
@@ -571,9 +544,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   443
 Reverse the effect of previous bad revision 23:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   444
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   445
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   446
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   447
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   448
 hg backout \-r 23
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   449
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   450
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   451
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   452
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   453
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   454
@@ -581,12 +554,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   455
 leave changes uncommitted:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   456
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   457
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   458
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   459
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   460
 hg backout \-r 23 \-\-no\-commit
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   461
 hg commit \-m "Backout revision 23"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   462
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   463
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   464
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   465
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   466
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   467
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   468
 By default, the pending changeset will have one parent,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   469
 maintaining a linear history. With \-\-merge, the pending
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   470
@@ -594,13 +567,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   471
 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
   472
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   473
 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
   474
-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
   475
+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
   476
 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
   477
 merged separately.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   478
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   479
-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
   480
+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
   481
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   482
-See \%\fBhg help revert\fP\: for a way to restore files to the state
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   483
+See \fBhg help revert\fP for a way to restore files to the state
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   484
 of another revision.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   485
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   486
 Returns 0 on success, 1 if nothing to backout or there are unresolved
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   487
@@ -607,7 +580,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   488
 files.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   489
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   490
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   491
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   492
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   493
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   494
 .B \-\-merge
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   495
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   496
@@ -660,7 +633,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   497
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   498
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   499
 record the specified user as committer
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   500
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   501
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   502
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   503
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   504
 .SS bisect
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   505
@@ -668,9 +641,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   506
 subdivision search of changesets:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   507
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   508
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   509
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   510
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   511
 hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   512
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   513
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   514
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   515
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   516
 This command helps to find changesets which introduce problems. To
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   517
@@ -694,16 +667,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   518
 is bad.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   519
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   520
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   521
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   522
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   523
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   524
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   525
 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
   526
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   527
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   528
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   529
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   530
 hg bisect \-\-bad 34
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   531
 hg bisect \-\-good 12
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   532
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   533
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   534
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   535
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   536
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   537
@@ -711,10 +684,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   538
 bad:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   539
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   540
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   541
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   542
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   543
 hg bisect \-\-good
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   544
 hg bisect \-\-bad
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   545
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   546
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   547
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   548
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   549
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   550
@@ -722,10 +695,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   551
 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
   552
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   553
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   554
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   555
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   556
 hg bisect \-\-skip
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   557
 hg bisect \-\-skip 23
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   558
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   559
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   560
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   561
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   562
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   563
@@ -732,9 +705,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   564
 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
   565
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   566
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   567
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   568
-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
   569
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   570
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   571
+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
   572
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   573
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   574
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   575
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   576
@@ -741,22 +714,22 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   577
 forget the current bisection:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   578
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   579
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   580
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   581
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   582
 hg bisect \-\-reset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   583
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   584
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   585
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   586
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   587
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   588
-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
   589
+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
   590
 revision:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   591
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   592
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   593
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   594
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   595
 hg bisect \-\-reset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   596
 hg bisect \-\-bad 34
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   597
 hg bisect \-\-good 12
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   598
 hg bisect \-\-command "make && make tests"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   599
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   600
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   601
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   602
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   603
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   604
@@ -764,9 +737,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   605
 bisection:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   606
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   607
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   608
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   609
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   610
 hg log \-r "bisect(pruned)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   611
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   612
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   613
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   614
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   615
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   616
@@ -774,9 +747,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   617
 if running with \-U/\-\-noupdate):
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   618
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   619
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   620
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   621
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   622
 hg log \-r "bisect(current)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   623
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   624
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   625
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   626
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   627
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   628
@@ -783,9 +756,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   629
 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
   630
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   631
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   632
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   633
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   634
 hg log \-r "bisect(range)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   635
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   636
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   637
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   638
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   639
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   640
@@ -792,18 +765,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   641
 you can even get a nice graph:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   642
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   643
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   644
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   645
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   646
 hg log \-\-graph \-r "bisect(range)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   647
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   648
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   649
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   650
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   651
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   652
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   653
-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
   654
+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
   655
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   656
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   657
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   658
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   659
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   660
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   661
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   662
 .B \-r,  \-\-reset
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   663
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   664
@@ -832,15 +805,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   665
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   666
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   667
 do not update to target
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   668
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   669
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   670
 .SS bookmarks
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   671
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   672
 create a new bookmark or list existing bookmarks:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   673
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   674
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   675
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   676
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   677
 hg bookmarks [OPTIONS]... [NAME]...
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   678
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   679
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   680
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   681
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   682
 Bookmarks are labels on changesets to help track lines of development.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   683
@@ -847,30 +820,30 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   684
 Bookmarks are unversioned and can be moved, renamed and deleted.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   685
 Deleting or moving a bookmark has no effect on the associated changesets.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   686
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   687
-Creating or updating to a bookmark causes it to be marked as \(aqactive\(aq.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   688
-The active bookmark is indicated with a \(aq*\(aq.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   689
+Creating or updating to a bookmark causes it to be marked as 'active'.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   690
+The active bookmark is indicated with a '*'.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   691
 When a commit is made, the active bookmark will advance to the new commit.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   692
-A plain \%\fBhg update\fP\: will also advance an active bookmark, if possible.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   693
+A plain \fBhg update\fP will also advance an active bookmark, if possible.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   694
 Updating away from a bookmark will cause it to be deactivated.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   695
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   696
 Bookmarks can be pushed and pulled between repositories (see
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   697
-\%\fBhg help push\fP\: and \%\fBhg help pull\fP\:). If a shared bookmark has
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   698
-diverged, a new \(aqdivergent bookmark\(aq of the form \%\(aqname@path\:\(aq will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   699
-be created. Using \%\fBhg merge\fP\: will resolve the divergence.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   700
+\fBhg help push\fP and \fBhg help pull\fP). If a shared bookmark has
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   701
+diverged, a new 'divergent bookmark' of the form \&'name@path\&' will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   702
+be created. Using \fBhg merge\fP will resolve the divergence.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   703
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   704
-A bookmark named \(aq@\(aq has the special property that \%\fBhg clone\fP\: will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   705
+A bookmark named '@' has the special property that \fBhg clone\fP will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   706
 check it out by default if it exists.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   707
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   708
 Examples:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   709
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   710
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   711
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   712
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   713
 create an active bookmark for a new line of development:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   714
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   715
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   716
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   717
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   718
 hg book new\-feature
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   719
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   720
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   721
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   722
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   723
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   724
@@ -877,9 +850,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   725
 create an inactive bookmark as a place marker:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   726
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   727
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   728
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   729
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   730
 hg book \-i reviewed
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   731
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   732
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   733
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   734
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   735
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   736
@@ -886,9 +859,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   737
 create an inactive bookmark on another changeset:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   738
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   739
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   740
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   741
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   742
 hg book \-r .^ tested
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   743
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   744
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   745
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   746
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   747
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   748
@@ -895,23 +868,23 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   749
 rename bookmark turkey to dinner:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   750
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   751
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   752
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   753
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   754
 hg book \-m turkey dinner
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   755
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   756
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   757
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   758
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   759
 .
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   760
-move the \(aq@\(aq bookmark from another branch:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   761
+move the '@' bookmark from another branch:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   762
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   763
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   764
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   765
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   766
 hg book \-f @
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   767
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   768
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   769
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   770
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   771
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   772
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   773
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   774
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   775
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   776
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   777
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   778
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   779
@@ -938,20 +911,20 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   780
 display with template (EXPERIMENTAL)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   781
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   782
 aliases: bookmark
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   783
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   784
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   785
 .SS branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   786
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   787
 set or show the current branch name:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   788
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   789
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   790
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   791
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   792
 hg branch [\-fC] [NAME]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   793
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   794
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   795
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   796
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   797
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   798
-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
   799
-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
   800
+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
   801
+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
   802
 information about named branches and bookmarks.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   803
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   804
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   805
@@ -958,7 +931,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   806
 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
   807
 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
   808
 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
   809
-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
   810
+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
   811
 branch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   812
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   813
 Unless \-f/\-\-force is specified, branch will not let you set a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   814
@@ -968,8 +941,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   815
 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
   816
 change.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   817
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   818
-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   819
-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch head as closed.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   820
+Use the command \fBhg update\fP to switch to an existing branch. Use
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   821
+\fBhg commit \-\-close\-branch\fP to mark this branch head as closed.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   822
 When all heads of a branch are closed, the branch will be
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   823
 considered closed.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   824
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   825
@@ -976,7 +949,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   826
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   827
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   828
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   829
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   830
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   831
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   832
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   833
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   834
@@ -985,27 +958,27 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   835
 .B \-C,  \-\-clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   836
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   837
 reset branch name to parent branch name
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   838
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   839
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   840
 .SS branches
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   841
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   842
 list repository named branches:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   843
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   844
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   845
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   846
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   847
 hg branches [\-ac]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   848
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   849
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   850
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   851
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   852
-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
   853
+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
   854
 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
   855
-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
   856
+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
   857
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   858
-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
   859
+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
   860
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   861
 Returns 0.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   862
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   863
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   864
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   865
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   866
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   867
 .B \-a,  \-\-active
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   868
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   869
@@ -1018,15 +991,15 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   870
 .BI \-T,  \-\-template \ <TEMPLATE>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
   871
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   872
 display with template (EXPERIMENTAL)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   873
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   874
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   875
 .SS bundle
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   876
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   877
 create a changegroup file:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   878
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   879
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   880
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   881
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   882
 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
   883
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   884
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   885
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   886
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   887
 Generate a changegroup file collecting changesets to be added
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   888
@@ -1055,7 +1028,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   889
 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
   890
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   891
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   892
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   893
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   894
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   895
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   896
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   897
@@ -1092,7 +1065,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   898
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   899
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   900
 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
   901
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   902
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   903
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   904
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   905
 .SS cat
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   906
@@ -1100,9 +1073,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   907
 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
   908
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   909
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   910
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   911
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   912
 hg cat [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   913
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   914
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   915
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   916
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   917
 Print the specified files as they were at the given revision. If
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   918
@@ -1110,7 +1083,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   919
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   920
 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
   921
 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
   922
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   923
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   924
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   925
 .B \fB%%\fP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   926
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   927
@@ -1122,7 +1095,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   928
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   929
 .B \fB%d\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   930
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   931
-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
   932
+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
   933
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   934
 .B \fB%p\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   935
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   936
@@ -1147,12 +1120,12 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   937
 .B \fB%b\fP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   938
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   939
 basename of the exporting repository
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   940
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   941
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   942
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   943
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   944
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   945
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   946
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   947
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   948
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   949
 .BI \-o,  \-\-output \ <FORMAT>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   950
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   951
@@ -1173,7 +1146,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   952
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   953
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   954
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   955
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
   956
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   957
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   958
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   959
 .SS clone
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   960
@@ -1181,9 +1154,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
   961
 make a copy of an existing repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   962
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   963
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   964
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   965
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   966
 hg clone [OPTION]... SOURCE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   967
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   968
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   969
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   970
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   971
 Create a copy of an existing repository in a new directory.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   972
@@ -1191,14 +1164,14 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   973
 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
   974
 basename of the source.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   975
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
   976
-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
   977
-\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
   978
+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
   979
+\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
   980
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   981
 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
   982
 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
   983
-\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
   984
+\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
   985
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   986
-If the source repository has a bookmark called \(aq@\(aq set, that
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   987
+If the source repository has a bookmark called '@' set, that
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   988
 revision will be checked out in the new repository by default.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   989
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   990
 To check out a particular version, use \-u/\-\-update, or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   991
@@ -1207,7 +1180,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
   992
 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
   993
 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
   994
 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
   995
-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
   996
+their ancestors. These options (or 'clone src#rev dest') imply
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   997
 \-\-pull, even for local source repositories.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   998
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
   999
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1000
@@ -1226,9 +1199,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1001
 directory using full hardlinks with
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1002
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1003
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1004
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1005
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1006
 $ cp \-al REPO REPOCLONE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1007
-.ft P
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1008
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1009
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1010
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1011
 This is the fastest way to clone, but it is not always safe. The
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1012
@@ -1240,7 +1213,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1013
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1014
 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
  1015
 revision from this list:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1016
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1017
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1018
 .IP a. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1019
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1020
 null if \-U or the source repository has no changesets
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1021
@@ -1247,7 +1220,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1022
 .IP b. 3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1023
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1024
 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
  1025
-the source repository\(aqs working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1026
+the source repository's working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1027
 .IP c. 3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1028
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1029
 the changeset specified with \-u (if a branch name, this means the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1030
@@ -1263,7 +1236,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1031
 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
  1032
 .IP g. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1033
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1034
-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
  1035
+the revision marked with the '@' bookmark, if present
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1036
 .IP h. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1037
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1038
 the tipmost head of the default branch
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1039
@@ -1270,7 +1243,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1040
 .IP i. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1041
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1042
 tip
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1043
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1044
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1045
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1046
 When cloning from servers that support it, Mercurial may fetch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1047
 pre\-generated data from a server\-advertised URL. When this is done,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1048
@@ -1278,18 +1251,18 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1049
 once for the bundle fetched from the URL and another for any additional
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1050
 data not fetched from this URL. In addition, if an error occurs, the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1051
 repository may be rolled back to a partial clone. This behavior may
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1052
-change in future releases. See \%\fBhg help \-e clonebundles\fP\: for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1053
+change in future releases. See \fBhg help \-e clonebundles\fP for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1054
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1055
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1056
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1057
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1058
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1059
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1060
 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
  1061
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1062
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1063
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1064
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1065
 hg clone http://selenic.com/hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1066
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1067
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1068
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1069
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1070
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1071
@@ -1296,9 +1269,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1072
 create a lightweight local clone:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1073
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1074
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1075
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1076
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1077
 hg clone project/ project\-feature/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1078
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1079
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1080
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1081
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1082
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1083
@@ -1305,9 +1278,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1084
 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
  1085
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1086
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1087
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1088
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1089
 hg clone ssh://user@server//home/projects/alpha/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1090
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1091
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1092
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1093
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1094
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1095
@@ -1315,9 +1288,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1096
 specified version:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1097
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1098
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1099
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1100
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1101
 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
  1102
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1103
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1104
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1105
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1106
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1107
@@ -1324,9 +1297,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1108
 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
  1109
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1110
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1111
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1112
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1113
 hg clone \-r 04e544 experimental/ good/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1114
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1115
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1116
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1117
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1118
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1119
@@ -1333,18 +1306,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1120
 clone (and track) a particular named branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1121
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1122
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1123
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1124
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1125
 hg clone http://selenic.com/hg#stable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1126
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1127
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1128
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1129
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1130
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1131
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1132
-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
  1133
+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
  1134
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1135
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1136
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1137
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1138
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1139
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1140
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1141
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1142
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1143
@@ -1381,7 +1354,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1144
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1145
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1146
 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
  1147
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1148
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1149
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1150
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1151
 .SS commit
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1152
@@ -1389,16 +1362,16 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1153
 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
  1154
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1155
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1156
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1157
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1158
 hg commit [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1159
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1160
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1161
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1162
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1163
 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
  1164
 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
  1165
-\%\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
  1166
+\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
  1167
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1168
-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
  1169
+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
  1170
 will be committed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1171
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1172
 If you are committing the result of a merge, do not provide any
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1173
@@ -1407,7 +1380,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1174
 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
  1175
 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
  1176
 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
  1177
-\fB.hg/last\-message.txt\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1178
+\fB\&.hg/last\-message.txt\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1179
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1180
 The \-\-close\-branch flag can be used to mark the current branch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1181
 head closed. When all heads of a branch are closed, the branch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1182
@@ -1415,32 +1388,32 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1183
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1184
 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
  1185
 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
  1186
-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
  1187
+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
  1188
 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
  1189
-\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
  1190
+\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
  1191
 on how to restore it).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1192
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1193
 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
  1194
-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
  1195
+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
  1196
 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
  1197
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1198
-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
  1199
+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
  1200
 or changesets that have children.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1201
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1202
-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
  1203
+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
  1204
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1205
 Returns 0 on success, 1 if nothing changed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1206
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1207
 Examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1208
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1209
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1210
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1211
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1212
 commit all files ending in .py:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1213
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1214
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1215
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1216
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1217
 hg commit \-\-include "set:**.py"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1218
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1219
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1220
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1221
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1222
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1223
@@ -1447,9 +1420,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1224
 commit all non\-binary files:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1225
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1226
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1227
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1228
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1229
 hg commit \-\-exclude "set:binary()"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1230
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1231
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1232
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1233
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1234
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1235
@@ -1456,14 +1429,14 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1236
 amend the current commit and set the date to now:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1237
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1238
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1239
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1240
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1241
 hg commit \-\-amend \-\-date now
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1242
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1243
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1244
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1245
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1246
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1247
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1248
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1249
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1250
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1251
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1252
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1253
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1254
@@ -1516,23 +1489,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1255
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1256
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1257
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1258
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1259
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1260
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1261
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1262
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1263
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1264
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1265
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1266
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1267
 aliases: ci
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1268
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1269
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1270
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1271
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1272
 .SS config
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1273
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1274
 show combined config settings from all hgrc files:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1275
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1276
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1277
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1278
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1279
 hg config [\-u] [NAME]...
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1280
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1281
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1282
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1283
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1284
 With no arguments, print names and values of all config items.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1285
@@ -1550,12 +1523,12 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1286
 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
  1287
 for each config item.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1288
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1289
-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
  1290
+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
  1291
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1292
 Returns 0 on success, 1 if NAME does not exist.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1293
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1294
 Options:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1295
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1296
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1297
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1298
 .B \-u,  \-\-untrusted
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1299
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1300
@@ -1574,15 +1547,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1301
 edit global config
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1302
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1303
 aliases: showconfig debugconfig
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1304
-.UNINDENT
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1305
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1306
 .SS copy
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1307
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1308
 mark files as copied for the next commit:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1309
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1310
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1311
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1312
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1313
 hg copy [OPTION]... [SOURCE]... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1314
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1315
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1316
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1317
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1318
 Mark dest as having copies of source files. If dest is a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1319
@@ -1594,12 +1567,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1320
 operation is recorded, but no copying is performed.
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
 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
  1323
-before that, see \%\fBhg revert\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1324
+before that, see \fBhg revert\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1325
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1326
 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
  1327
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1328
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1329
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1330
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1331
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1332
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1333
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1334
@@ -1620,23 +1593,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1335
 .B \-n,  \-\-dry\-run
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1336
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1337
 do not perform actions, just print output
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1338
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1339
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1340
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1341
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1342
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1343
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1344
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1345
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1346
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1347
 aliases: cp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1348
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1349
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1350
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1351
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1352
 .SS diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1353
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1354
 diff repository (or selected files):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1355
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1356
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1357
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1358
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1359
 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
  1360
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1361
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1362
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1363
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1364
 Show differences between revisions for the specified files.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1365
@@ -1644,8 +1617,8 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1366
 Differences between files are shown using the unified diff format.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1367
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1368
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1369
-\%\fBhg diff\fP\: may generate unexpected results for merges, as it will
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1370
-default to comparing against the working directory\(aqs first
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1371
+\fBhg diff\fP may generate unexpected results for merges, as it will
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1372
+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
  1373
 parent changeset if no revisions are specified.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  1374
 .RE
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  1375
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1376
@@ -1663,18 +1636,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1377
 anyway, probably with undesirable results.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1378
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1379
 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
  1380
-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
  1381
+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
  1382
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1383
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1384
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1385
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1386
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1387
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1388
 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
  1389
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1390
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1391
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1392
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1393
 hg diff foo.c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1394
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1395
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1396
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1397
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1398
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1399
@@ -1681,9 +1654,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1400
 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
  1401
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1402
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1403
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1404
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1405
 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
  1406
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1407
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1408
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1409
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1410
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1411
@@ -1690,9 +1663,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1412
 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
  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
-hg diff \-\-stat \-r "date(\(aqmay 2\(aq)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1417
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1418
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1419
+hg diff \-\-stat \-r "date('may 2')"
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
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1424
@@ -1699,9 +1672,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1425
 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
  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 diff "set:added() and grep(GNU)"
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
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1436
@@ -1708,18 +1681,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1437
 compare a revision and its parents:
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 diff \-c 9353         # compare against first parent
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1443
 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
  1444
 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
  1445
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1446
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1447
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1448
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1449
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1450
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1451
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1452
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1453
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1454
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1455
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1456
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1457
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1458
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1459
@@ -1788,7 +1761,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1460
 .B \-S,  \-\-subrepos
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1461
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1462
 recurse into subrepositories
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1463
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1464
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1465
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1466
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1467
 .SS export
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1468
@@ -1796,9 +1769,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1469
 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
  1470
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1471
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1472
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1473
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1474
 hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1475
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1476
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1477
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1478
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1479
 Print the changeset header and diffs for one or more revisions.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1480
@@ -1809,7 +1782,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1481
 comment.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1482
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1483
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1484
-\%\fBhg export\fP\: may generate unexpected diff output for merge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1485
+\fBhg export\fP may generate unexpected diff output for merge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1486
 changesets, as it will compare the merge changeset against its
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1487
 first parent only.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1488
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1489
@@ -1816,7 +1789,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1490
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1491
 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
  1492
 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
  1493
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1494
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1495
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1496
 .B \fB%%\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1497
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1498
@@ -1853,7 +1826,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1499
 .B \fB%r\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1500
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1501
 zero\-padded changeset revision number
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1502
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1503
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1504
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1505
 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
  1506
 of files it detects as binary. With \-a, export will generate a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1507
@@ -1860,13 +1833,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1508
 diff anyway, probably with undesirable results.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1509
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1510
 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
  1511
-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
  1512
+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
  1513
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1514
 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
  1515
 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
  1516
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1517
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1518
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1519
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1520
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1521
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1522
 use export and import to transplant a bugfix to the current
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1523
@@ -1873,9 +1846,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1524
 branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1525
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1526
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1527
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1528
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1529
 hg export \-r 9353 | hg import \-
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1530
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1531
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1532
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1533
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1534
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1535
@@ -1883,9 +1856,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1536
 rename information:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1537
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1538
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1539
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1540
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1541
 hg export \-\-git \-r 123:150 > changes.txt
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1542
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1543
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1544
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1545
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1546
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1547
@@ -1893,16 +1866,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1548
 descriptive names:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1549
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1550
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1551
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1552
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1553
 hg export \-r "outgoing()" \-o "%n\-%m.patch"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1554
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1555
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1556
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1557
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1558
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1559
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1560
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1561
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1562
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1563
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1564
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1565
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1566
 .BI \-o,  \-\-output \ <FORMAT>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1567
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1568
@@ -1927,7 +1900,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1569
 .B \-\-nodates
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1570
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1571
 omit dates from diff headers
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1572
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1573
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1574
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1575
 [+] marked option can be specified multiple times
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1576
 .SS files
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1577
@@ -1935,9 +1908,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1578
 list tracked files:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1579
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1580
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1581
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1582
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1583
 hg files [OPTION]... [PATTERN]...
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1584
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1585
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1586
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1587
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1588
 Print files under Mercurial control in the working directory or
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1589
@@ -1948,15 +1921,15 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  1590
 of all files under Mercurial control in the working directory.
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1591
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1592
 Examples:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1593
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1594
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1595
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1596
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1597
 list all files under the current directory:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1598
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1599
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1600
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1601
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1602
 hg files .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1603
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1604
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1605
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1606
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1607
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1608
@@ -1963,9 +1936,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1609
 shows sizes and flags for current revision:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1610
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1611
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1612
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1613
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1614
 hg files \-vr .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1615
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1616
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1617
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1618
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1619
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1620
@@ -1972,9 +1945,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1621
 list all files named README:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1622
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1623
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1624
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1625
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1626
 hg files \-I "**/README"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1627
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1628
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1629
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1630
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1631
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1632
@@ -1981,9 +1954,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1633
 list all binary files:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1634
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1635
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1636
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1637
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1638
 hg files "set:binary()"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1639
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1640
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1641
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1642
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1643
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1644
@@ -1990,9 +1963,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1645
 find files containing a regular expression:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1646
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1647
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1648
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1649
-hg files "set:grep(\(aqbob\(aq)"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1650
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1651
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1652
+hg files "set:grep('bob')"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1653
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1654
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1655
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1656
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1657
@@ -1999,19 +1972,19 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1658
 search tracked file contents with xargs and grep:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1659
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1660
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1661
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1662
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1663
 hg files \-0 | xargs \-0 grep foo
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1664
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1665
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1666
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1667
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1668
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1669
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1670
-See \%\fBhg help patterns\fP\: and \%\fBhg help filesets\fP\: for more information
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1671
+See \fBhg help patterns\fP and \fBhg help filesets\fP for more information
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1672
 on specifying file patterns.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1673
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1674
 Returns 0 if a match is found, 1 otherwise.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1675
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1676
 Options:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1677
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1678
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1679
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1680
 .BI \-r,  \-\-rev \ <REV>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1681
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1682
@@ -2036,7 +2009,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  1683
 .B \-S,  \-\-subrepos
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  1684
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  1685
 recurse into subrepositories
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1686
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1687
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1688
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1689
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1690
 .SS forget
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1691
@@ -2044,9 +2017,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1692
 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
  1693
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1694
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1695
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1696
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1697
 hg forget [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1698
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1699
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1700
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1701
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1702
 Mark the specified files so they will no longer be tracked
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1703
@@ -2056,20 +2029,20 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1704
 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
  1705
 working directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1706
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1707
-To delete the file from the working directory, see \%\fBhg remove\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1708
+To delete the file from the working directory, see \fBhg remove\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1709
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1710
-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
  1711
+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
  1712
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1713
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1714
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1715
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1716
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1717
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1718
 forget newly\-added binary files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1719
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1720
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1721
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1722
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1723
 hg forget "set:added() and binary()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1724
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1725
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1726
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1727
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1728
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1729
@@ -2076,16 +2049,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1730
 forget files that would be excluded by .hgignore:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1731
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1732
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1733
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1734
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1735
 hg forget "set:hgignore()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1736
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1737
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1738
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1739
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1740
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1741
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1742
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1743
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1744
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1745
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1746
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1747
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1748
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1749
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1750
@@ -2094,7 +2067,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1751
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1752
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1753
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1754
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1755
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1756
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1757
 [+] marked option can be specified multiple times
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1758
 .SS graft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1759
@@ -2102,15 +2075,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1760
 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
  1761
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1762
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1763
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1764
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1765
 hg graft [OPTION]... [\-r REV]... REV...
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1766
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1767
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1768
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1769
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1770
-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
  1771
+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
  1772
 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
  1773
-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
  1774
-\(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
  1775
+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
  1776
+\&'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
  1777
 description from the source changesets.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1778
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1779
 Changesets that are ancestors of the current revision, that have
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1780
@@ -2120,9 +2093,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1781
 of the form:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1782
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1783
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1784
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1785
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1786
 (grafted from CHANGESETHASH)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1787
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1788
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1789
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1790
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1791
 If \-\-force is specified, revisions will be grafted even if they
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1792
@@ -2140,16 +2113,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1793
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1794
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1795
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1796
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1797
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1798
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1799
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1800
 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
  1801
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1802
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1803
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1804
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1805
 hg update stable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1806
 hg graft \-\-edit 9393
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1807
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1808
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1809
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1810
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1811
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1812
@@ -2156,9 +2129,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1813
 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
  1814
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1815
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1816
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1817
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1818
 hg graft \-D "2085::2093 and not 2091"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1819
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1820
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1821
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1822
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1823
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1824
@@ -2165,9 +2138,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1825
 continue a graft after resolving conflicts:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1826
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1827
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1828
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1829
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1830
 hg graft \-c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1831
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1832
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1833
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1834
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1835
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1836
@@ -2174,9 +2147,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1837
 show the source of a grafted changeset:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1838
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1839
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1840
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1841
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1842
 hg log \-\-debug \-r .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1843
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1844
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1845
 .fi
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1846
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1847
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1848
@@ -2183,19 +2156,19 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1849
 show revisions sorted by date:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1850
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1851
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1852
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1853
-hg log \-r \(aqsort(all(), date)\(aq
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1854
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1855
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1856
+hg log \-r 'sort(all(), date)'
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1857
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1858
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1859
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1860
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1861
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1862
-See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1863
+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1864
 specifying revisions.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  1865
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1866
 Returns 0 on successful completion.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1867
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1868
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1869
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1870
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1871
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1872
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1873
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1874
@@ -2240,7 +2213,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1875
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1876
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1877
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1878
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1879
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1880
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1881
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1882
 .SS grep
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1883
@@ -2248,9 +2221,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1884
 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
  1885
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1886
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1887
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1888
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1889
 hg grep [OPTION]... PATTERN [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1890
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1891
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1892
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1893
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1894
 Search revisions of files for a regular expression.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1895
@@ -2269,7 +2242,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1896
 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
  1897
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1898
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1899
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1900
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1901
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1902
 .B \-0,  \-\-print0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1903
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1904
@@ -2318,7 +2291,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1905
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1906
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1907
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1908
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1909
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1910
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1911
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1912
 .SS heads
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1913
@@ -2326,9 +2299,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1914
 show branch heads:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1915
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1916
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1917
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1918
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1919
 hg heads [\-ct] [\-r STARTREV] [REV]...
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1920
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1921
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1922
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1923
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1924
 With no arguments, show all open branch heads in the repository.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1925
@@ -2338,11 +2311,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1926
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1927
 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
  1928
 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
  1929
-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
  1930
+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
  1931
 currently checked\-out branch.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1932
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1933
 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
  1934
-(see \%\fBhg commit \-\-close\-branch\fP\:).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1935
+(see \fBhg commit \-\-close\-branch\fP).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1936
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1937
 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
  1938
 STARTREV will be displayed.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1939
@@ -2353,7 +2326,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1940
 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
  1941
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1942
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1943
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1944
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1945
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1946
 .BI \-r,  \-\-rev \ <STARTREV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1947
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1948
@@ -2378,15 +2351,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1949
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1950
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1951
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1952
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1953
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1954
 .SS help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1955
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1956
 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
  1957
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1958
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1959
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1960
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1961
 hg help [\-ecks] [TOPIC]
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1962
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1963
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1964
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1965
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1966
 With no arguments, print a list of commands with short help messages.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1967
@@ -2397,7 +2370,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1968
 Returns 0 if successful.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1969
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1970
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1971
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1972
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1973
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1974
 .B \-e,  \-\-extension
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1975
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1976
@@ -2414,7 +2387,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1977
 .BI \-s,  \-\-system \ <VALUE[+]>
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1978
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1979
 show help for specific platform(s)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1980
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1981
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1982
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1983
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1984
 .SS identify
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1985
@@ -2422,9 +2395,9 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  1986
 identify the working directory or specified revision:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  1987
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1988
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1989
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1990
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1991
 hg identify [\-nibtB] [\-r REV] [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1992
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1993
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1994
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  1995
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  1996
 Print a summary identifying the repository state at REV using one or
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  1997
@@ -2439,15 +2412,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1998
 cause lookup to operate on that repository/bundle.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  1999
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2000
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2001
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2002
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2003
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2004
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2005
 generate a build identifier for the working directory:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2006
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2007
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2008
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2009
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2010
 hg id \-\-id > build\-id.dat
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2011
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2012
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2013
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2014
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2015
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2016
@@ -2454,9 +2427,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2017
 find the revision corresponding to a tag:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2018
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2019
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2020
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2021
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2022
 hg id \-n \-r 1.3
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2023
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2024
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2025
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2026
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2027
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2028
@@ -2463,19 +2436,19 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2029
 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
  2030
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2031
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2032
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2033
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2034
 hg id \-r tip http://selenic.com/hg/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2035
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2036
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2037
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2038
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2039
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2040
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2041
-See \%\fBhg log\fP\: for generating more information about specific revisions,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2042
+See \fBhg log\fP for generating more information about specific revisions,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2043
 including full hash identifiers.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2044
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2045
 Returns 0 if successful.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2046
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2047
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2048
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2049
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2050
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2051
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2052
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2053
@@ -2514,15 +2487,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2054
 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
  2055
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2056
 aliases: id
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2057
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2058
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2059
 .SS import
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2060
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2061
 import an ordered set of patches:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2062
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2063
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2064
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2065
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2066
 hg import [OPTION]... PATCH...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2067
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2068
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2069
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2070
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2071
 Import a list of patches and commit them individually (unless
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2072
@@ -2547,7 +2520,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2073
 text/plain body parts before first diff are added to the commit
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2074
 message.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2075
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2076
-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
  2077
+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
  2078
 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
  2079
 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
  2080
 override these.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2081
@@ -2561,37 +2534,37 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2082
 Use \-\-partial to ensure a changeset will be created from the patch
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2083
 even if some hunks fail to apply. Hunks that fail to apply will be
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2084
 written to a <target\-file>.rej file. Conflicts can then be resolved
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2085
-by hand before \%\fBhg commit \-\-amend\fP\: is run to update the created
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2086
+by hand before \fBhg commit \-\-amend\fP is run to update the created
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2087
 changeset. This flag exists to let people import patches that
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2088
 partially apply without losing the associated metadata (author,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2089
 date, description, ...).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2090
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2091
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2092
-When no hunks apply cleanly, \%\fBhg import \-\-partial\fP\: will create
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2093
+When no hunks apply cleanly, \fBhg import \-\-partial\fP will create
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2094
 an empty changeset, importing only the patch metadata.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2095
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2096
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2097
 With \-s/\-\-similarity, hg will attempt to discover renames and
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2098
-copies in the patch in the same way as \%\fBhg addremove\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2099
+copies in the patch in the same way as \fBhg addremove\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2100
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2101
 It is possible to use external patch programs to perform the patch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2102
 by setting the \fBui.patch\fP configuration option. For the default
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2103
 internal tool, the fuzz can also be configured via \fBpatch.fuzz\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2104
-See \%\fBhg help config\fP\: for more information about configuration
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2105
+See \fBhg help config\fP for more information about configuration
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2106
 files and how to use these options.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2107
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2108
-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
  2109
+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
  2110
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2111
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2112
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2113
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2114
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2115
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2116
 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
  2117
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2118
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2119
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2120
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2121
 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
  2122
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2123
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2124
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2125
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2126
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2127
@@ -2598,9 +2571,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2128
 import a changeset from an hgweb server:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2129
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2130
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2131
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2132
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2133
 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
  2134
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2135
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2136
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2137
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2138
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2139
@@ -2607,9 +2580,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2140
 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
  2141
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2142
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2143
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2144
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2145
 hg import incoming\-patches.mbox
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2146
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2147
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2148
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2149
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2150
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2151
@@ -2617,35 +2590,35 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2152
 possible):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2153
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2154
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2155
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2156
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2157
 hg import \-\-exact proposed\-fix.patch
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2158
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2159
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2160
 .fi
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2161
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2162
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2163
 use an external tool to apply a patch which is too fuzzy for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2164
 the default internal tool.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2165
-.INDENT 2.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2166
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2167
+.RS 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2168
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2169
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2170
 hg import \-\-config ui.patch="patch \-\-merge" fuzzy.patch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2171
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2172
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2173
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2174
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2175
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2176
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2177
 change the default fuzzing from 2 to a less strict 7
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2178
-.INDENT 2.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2179
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2180
+.RS 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2181
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2182
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2183
 hg import \-\-config ui.fuzz=7 fuzz.patch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2184
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2185
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2186
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2187
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2188
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2189
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2190
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2191
 Returns 0 on success, 1 on partial success (see \-\-partial).
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2192
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2193
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2194
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2195
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2196
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2197
 .BI \-p,  \-\-strip \ <NUM>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2198
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2199
@@ -2665,7 +2638,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2200
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2201
 .B \-\-no\-commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2202
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2203
-don\(aqt commit, just update the working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2204
+don't commit, just update the working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2205
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2206
 .B \-\-bypass
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2207
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2208
@@ -2708,15 +2681,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2209
 guess renamed files by similarity (0<=s<=100)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2210
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2211
 aliases: patch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2212
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2213
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2214
 .SS incoming
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2215
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2216
 show new changesets found in source:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2217
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2218
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2219
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2220
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2221
 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
  2222
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2223
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2224
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2225
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2226
 Show new changesets found in the specified path/URL or the default
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2227
@@ -2730,17 +2703,17 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2228
 status is also displayed for each bookmark like below:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2229
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2230
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2231
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2232
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2233
 BM1               01234567890a added
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2234
 BM2               1234567890ab advanced
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2235
 BM3               234567890abc diverged
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2236
 BM4               34567890abcd changed
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2237
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2238
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2239
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2240
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2241
 The action taken locally when pulling depends on the
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2242
 status of each bookmark:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2243
-.INDENT 0.0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2244
+.RS 0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2245
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2246
 .B \fBadded\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2247
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2248
@@ -2757,7 +2730,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2249
 .B \fBchanged\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2250
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2251
 result depends on remote changesets
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2252
-.UNINDENT
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2253
+.RE
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2254
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2255
 From the point of view of pulling behavior, bookmark
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2256
 existing only in the remote repository are treated as \fBadded\fP,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2257
@@ -2767,15 +2740,15 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2258
 changesets twice if the incoming is followed by a pull.
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2259
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2260
 Examples:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2261
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2262
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2263
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2264
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2265
 show incoming changes with patches and full description:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2266
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2267
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2268
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2269
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2270
 hg incoming \-vp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2271
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2272
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2273
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2274
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2275
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2276
@@ -2782,10 +2755,10 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2277
 show incoming changes excluding merges, store a bundle:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2278
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2279
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2280
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2281
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2282
 hg in \-vpM \-\-bundle incoming.hg
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2283
 hg pull incoming.hg
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2284
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2285
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2286
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2287
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2288
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2289
@@ -2792,16 +2765,16 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2290
 briefly list changes inside a bundle:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2291
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2292
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2293
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2294
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2295
 hg in changes.hg \-T "{desc|firstline}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2296
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2297
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2298
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2299
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2300
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2301
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2302
 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
  2303
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2304
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2305
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2306
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2307
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2308
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2309
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2310
@@ -2874,23 +2847,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2311
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2312
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2313
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2314
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2315
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2316
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2317
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2318
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2319
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2320
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2321
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2322
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2323
 aliases: in
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2324
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2325
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2326
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2327
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2328
 .SS init
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2329
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2330
 create a new repository in the given directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2331
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2332
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2333
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2334
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2335
 hg init [\-e CMD] [\-\-remotecmd CMD] [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2336
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2337
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2338
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2339
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2340
 Initialize a new repository in the given directory. If the given
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2341
@@ -2899,12 +2872,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2342
 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
  2343
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2344
 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
  2345
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2346
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2347
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2348
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2349
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2350
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2351
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2352
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2353
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2354
 .BI \-e,  \-\-ssh \ <CMD>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2355
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2356
@@ -2917,15 +2890,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2357
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2358
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2359
 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
  2360
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2361
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2362
 .SS locate
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2363
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2364
 locate files matching specific patterns (DEPRECATED):
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2365
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2366
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2367
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2368
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2369
 hg locate [OPTION]... [PATTERN]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2370
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2371
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2372
 .fi
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
 Print files under Mercurial control in the working directory whose
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2375
@@ -2943,12 +2916,12 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2376
 will avoid the problem of "xargs" treating single filenames that
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2377
 contain whitespace as multiple filenames.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2378
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2379
-See \%\fBhg help files\fP\: for a more versatile command.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2380
+See \fBhg help files\fP for a more versatile command.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2381
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2382
 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
  2383
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2384
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2385
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2386
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2387
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2388
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2389
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2390
@@ -2969,7 +2942,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2391
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2392
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2393
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2394
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2395
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2396
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2397
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2398
 .SS log
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2399
@@ -2977,9 +2950,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2400
 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
  2401
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2402
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2403
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2404
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2405
 hg log [OPTION]... [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2406
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2407
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2408
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2409
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2410
 Print the revision history of the specified files or the entire
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2411
@@ -3001,12 +2974,12 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2412
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2413
 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
  2414
 recent changeset at the top.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2415
-\(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
  2416
-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
  2417
-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
  2418
+\&'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
  2419
+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
  2420
+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
  2421
 .IP Note
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2422
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2423
-\%\fBhg log \-\-patch\fP\: may generate unexpected diff output for merge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2424
+\fBhg log \-\-patch\fP may generate unexpected diff output for merge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2425
 changesets, as it will only compare the merge changeset against
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2426
 its first parent. Also, only files different from BOTH parents
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2427
 will appear in files:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2428
@@ -3013,21 +2986,21 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2429
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2430
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2431
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2432
-For performance reasons, \%\fBhg log FILE\fP\: may omit duplicate changes
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2433
+For performance reasons, \fBhg log FILE\fP may omit duplicate changes
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2434
 made on branches and will not show removals or mode changes. To
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2435
 see all such changes, use the \-\-removed switch.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2436
 .RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2437
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2438
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2439
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2440
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2441
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2442
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2443
 changesets with full descriptions and file lists:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2444
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2445
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2446
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2447
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2448
 hg log \-v
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2449
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2450
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2451
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2452
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2453
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2454
@@ -3034,9 +3007,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2455
 changesets ancestral to the working directory:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2456
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2457
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2458
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2459
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2460
 hg log \-f
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2461
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2462
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2463
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2464
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2465
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2466
@@ -3043,9 +3016,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2467
 last 10 commits on the current branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2468
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2469
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2470
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2471
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2472
 hg log \-l 10 \-b .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2473
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2474
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2475
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2476
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2477
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2478
@@ -3052,9 +3025,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2479
 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
  2480
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2481
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2482
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2483
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2484
 hg log \-\-removed file.c
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2485
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2486
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2487
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2488
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2489
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2490
@@ -3061,9 +3034,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2491
 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
  2492
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2493
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2494
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2495
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2496
 hg log \-Mp lib/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2497
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2498
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2499
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2500
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2501
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2502
@@ -3070,9 +3043,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2503
 all revision numbers that match a keyword:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2504
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2505
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2506
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2507
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2508
 hg log \-k bug \-\-template "{rev}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2509
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2510
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2511
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2512
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2513
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2514
@@ -3079,9 +3052,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2515
 the full hash identifier of the working directory parent:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2516
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2517
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2518
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2519
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2520
 hg log \-r . \-\-template "{node}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2521
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2522
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2523
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2524
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2525
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2526
@@ -3088,9 +3061,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2527
 list available log templates:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2528
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2529
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2530
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2531
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2532
 hg log \-T list
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2533
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2534
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2535
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2536
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2537
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2538
@@ -3097,9 +3070,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2539
 check if a given changeset is included in a tagged release:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2540
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2541
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2542
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2543
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2544
 hg log \-r "a21ccf and ancestor(1.9)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2545
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2546
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2547
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2548
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2549
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2550
@@ -3106,9 +3079,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2551
 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
  2552
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2553
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2554
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2555
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2556
 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
  2557
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2558
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2559
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2560
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2561
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2562
@@ -3115,24 +3088,24 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2563
 summary of all changesets after the last tag:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2564
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2565
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2566
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2567
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2568
 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
  2569
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2570
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2571
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2572
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2573
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2574
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2575
-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
  2576
+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
  2577
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2578
-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
  2579
+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2580
 specifying and ordering revisions.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2581
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2582
-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
  2583
+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
  2584
 specifying custom templates.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2585
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2586
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2587
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2588
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2589
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2590
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2591
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2592
 .B \-f,  \-\-follow
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2593
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2594
@@ -3221,23 +3194,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2595
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2596
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2597
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2598
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2599
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2600
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2601
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2602
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2603
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2604
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2605
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2606
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2607
 aliases: history
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2608
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2609
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2610
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2611
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2612
 .SS manifest
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2613
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2614
 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
  2615
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2616
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2617
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2618
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2619
 hg manifest [\-r REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2620
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2621
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2622
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2623
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2624
 Print a list of version controlled files for the given revision.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2625
@@ -3253,7 +3226,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2626
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2627
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2628
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2629
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2630
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2631
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2632
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2633
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2634
@@ -3266,15 +3239,15 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2635
 .BI \-T,  \-\-template \ <TEMPLATE>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2636
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2637
 display with template (EXPERIMENTAL)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2638
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2639
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2640
 .SS merge
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2641
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2642
 merge another revision into working directory:
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2643
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2644
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2645
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2646
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2647
 hg merge [\-P] [\-f] [[\-r] REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2648
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2649
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2650
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2651
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2652
 The current working directory is updated with all changes made in
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2653
@@ -3287,16 +3260,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2654
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2655
 \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
  2656
 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
  2657
-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
  2658
+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
  2659
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2660
-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
  2661
+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
  2662
 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
  2663
 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
  2664
 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
  2665
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2666
-See \%\fBhg help resolve\fP\: for information on handling file conflicts.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2667
+See \fBhg help resolve\fP for information on handling file conflicts.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2668
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2669
-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
  2670
+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
  2671
 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
  2672
 all changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2673
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2674
@@ -3303,7 +3276,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2675
 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
  2676
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2677
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2678
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2679
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2680
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2681
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2682
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2683
@@ -3320,15 +3293,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2684
 .BI \-t,  \-\-tool \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2685
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2686
 specify merge tool
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2687
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2688
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2689
 .SS outgoing
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2690
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2691
 show changesets not found in the destination:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2692
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2693
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2694
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2695
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2696
 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
  2697
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2698
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2699
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2700
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2701
 Show changesets not found in the specified destination repository
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2702
@@ -3342,18 +3315,18 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2703
 status is also displayed for each bookmark like below:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2704
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2705
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2706
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2707
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2708
 BM1               01234567890a added
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2709
 BM2                            deleted
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2710
 BM3               234567890abc advanced
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2711
 BM4               34567890abcd diverged
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2712
 BM5               4567890abcde changed
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2713
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2714
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2715
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2716
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2717
 The action taken when pushing depends on the
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2718
 status of each bookmark:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2719
-.INDENT 0.0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2720
+.RS 0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2721
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2722
 .B \fBadded\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2723
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2724
@@ -3374,7 +3347,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2725
 .B \fBchanged\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2726
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2727
 push with \fB\-B\fP will update it
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2728
-.UNINDENT
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2729
+.RE
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2730
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2731
 From the point of view of pushing behavior, bookmarks
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  2732
 existing only in the remote repository are treated as
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2733
@@ -3383,7 +3356,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2734
 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
  2735
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2736
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2737
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2738
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2739
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2740
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2741
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2742
@@ -3452,26 +3425,26 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2743
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2744
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2745
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2746
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2747
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2748
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2749
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2750
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2751
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2752
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2753
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2754
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2755
 aliases: out
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2756
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2757
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2758
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2759
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2760
 .SS parents
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2761
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2762
 show the parents of the working directory or revision (DEPRECATED):
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2763
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2764
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2765
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2766
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2767
 hg parents [\-r REV] [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2768
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2769
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2770
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2771
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2772
-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
  2773
+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
  2774
 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
  2775
 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
  2776
 last changed (before the working directory revision or the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2777
@@ -3480,20 +3453,20 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2778
 This command is equivalent to:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2779
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2780
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2781
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2782
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2783
 hg log \-r "p1()+p2()" or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2784
 hg log \-r "p1(REV)+p2(REV)" or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2785
 hg log \-r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2786
 hg log \-r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2787
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2788
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2789
 .fi
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2790
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2791
-See \%\fBhg summary\fP\: and \%\fBhg help revsets\fP\: for related information.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2792
+See \fBhg summary\fP and \fBhg help revsets\fP for related information.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  2793
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2794
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2795
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2796
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2797
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2798
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2799
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2800
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2801
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2802
@@ -3506,15 +3479,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2803
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2804
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2805
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2806
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2807
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2808
 .SS paths
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2809
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2810
 show aliases for remote repositories:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2811
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2812
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2813
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2814
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2815
 hg paths [NAME]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2816
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2817
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2818
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2819
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2820
 Show definition of symbolic path name NAME. If no name is given,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2821
@@ -3537,29 +3510,29 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2822
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2823
 .
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2824
 \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2825
-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2826
-and \%\fBhg bundle\fP\:) operations.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2827
+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2828
+and \fBhg bundle\fP) operations.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2829
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2830
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2831
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2832
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2833
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2834
 Returns 0 on success.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2835
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2836
 Options:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2837
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2838
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2839
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2840
 .BI \-T,  \-\-template \ <TEMPLATE>
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2841
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2842
 display with template (EXPERIMENTAL)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2843
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2844
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2845
 .SS phase
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2846
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2847
 set or show the current phase name:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2848
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2849
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2850
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2851
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2852
 hg phase [\-p|\-d|\-s] [\-f] [\-r] [REV...]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2853
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2854
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2855
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2856
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2857
 With no argument, show the phase name of the current revision(s).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2858
@@ -3567,21 +3540,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2859
 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
  2860
 phase value of the specified revisions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2861
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2862
-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
  2863
+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
  2864
 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
  2865
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2866
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2867
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2868
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2869
 public < draft < secret
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2870
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2871
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2872
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  2873
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2874
 Returns 0 on success, 1 if some phases could not be changed.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2875
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2876
-(For more information about the phases concept, see \%\fBhg help phases\fP\:.)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2877
+(For more information about the phases concept, see \fBhg help phases\fP.)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2878
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2879
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2880
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2881
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2882
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2883
 .B \-p,  \-\-public
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2884
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2885
@@ -3602,7 +3575,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2886
 .BI \-r,  \-\-rev \ <REV[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2887
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2888
 target revision
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2889
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2890
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2891
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2892
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2893
 .SS pull
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2894
@@ -3610,9 +3583,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2895
 pull changes from the specified source:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2896
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2897
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2898
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2899
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2900
 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
  2901
-.ft P
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
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2904
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2905
 Pull changes from a remote repository to a local one.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2906
@@ -3622,18 +3595,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2907
 \-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
  2908
 project in the working directory.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2909
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2910
-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
  2911
+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
  2912
 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
  2913
-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
  2914
-\-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
  2915
+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
  2916
+\-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
  2917
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2918
-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
  2919
-See \%\fBhg help urls\fP\: for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2920
+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
  2921
+See \fBhg help urls\fP for more information.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2922
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2923
 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
  2924
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2925
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2926
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2927
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2928
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2929
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2930
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2931
@@ -3666,7 +3639,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2932
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2933
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2934
 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
  2935
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2936
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2937
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2938
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2939
 .SS push
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2940
@@ -3674,9 +3647,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2941
 push changes to the specified destination:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2942
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2943
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2944
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2945
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2946
 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
  2947
-.ft P
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
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2950
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2951
 Push changesets from the local repository to the specified
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2952
@@ -3707,13 +3680,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2953
 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
  2954
 repository.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2955
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2956
-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
  2957
+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
  2958
 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
  2959
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2960
 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
  2961
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2962
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2963
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2964
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2965
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2966
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2967
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2968
@@ -3746,7 +3719,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2969
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2970
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2971
 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
  2972
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  2973
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2974
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2975
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2976
 .SS recover
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2977
@@ -3754,9 +3727,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2978
 roll back an interrupted transaction:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2979
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2980
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2981
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2982
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2983
 hg recover
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2984
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2985
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2986
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2987
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2988
 Recover from an interrupted commit or pull.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  2989
@@ -3771,16 +3744,16 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  2990
 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
  2991
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2992
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2993
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2994
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2995
 hg remove [OPTION]... FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2996
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2997
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2998
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  2999
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3000
 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
  3001
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3002
 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
  3003
-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
  3004
-files, see \%\fBhg forget\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3005
+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
  3006
+files, see \fBhg forget\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3007
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3008
 \-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
  3009
 been deleted, \-f/\-\-force can be used to force deletion, and \-Af
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3010
@@ -3790,7 +3763,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3011
 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
  3012
 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
  3013
 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
  3014
-(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
  3015
+(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
  3016
 (from branch) and Delete (from disk):
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3017
 .TS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3018
 center;
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3019
@@ -3859,7 +3832,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3020
 .TE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3021
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3022
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3023
-\%\fBhg remove\fP\: never deletes files in Added [A] state from the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3024
+\fBhg remove\fP never deletes files in Added [A] state from the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3025
 working directory, not even if \fB\-\-force\fP is specified.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3026
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3027
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3028
@@ -3866,7 +3839,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3029
 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
  3030
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3031
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3032
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3033
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3034
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3035
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3036
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3037
@@ -3887,23 +3860,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3038
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3039
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3040
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3041
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3042
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3043
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3044
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3045
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3046
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3047
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3048
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3049
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3050
 aliases: rm
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3051
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3052
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3053
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3054
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3055
 .SS rename
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3056
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3057
 rename files; equivalent of copy + remove:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3058
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3059
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3060
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3061
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3062
 hg rename [OPTION]... SOURCE... DEST
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3063
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3064
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3065
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3066
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3067
 Mark dest as copies of sources; mark sources for deletion. If dest
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3068
@@ -3915,12 +3888,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3069
 operation is recorded, but no copying is performed.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3070
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3071
 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
  3072
-before that, see \%\fBhg revert\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3073
+before that, see \fBhg revert\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3074
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3075
 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
  3076
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3077
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3078
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3079
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3080
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3081
 .B \-A,  \-\-after
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3082
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3083
@@ -3941,23 +3914,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3084
 .B \-n,  \-\-dry\-run
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3085
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3086
 do not perform actions, just print output
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3087
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3088
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3089
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3090
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3091
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3092
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3093
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3094
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3095
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3096
 aliases: move mv
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3097
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3098
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3099
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3100
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3101
 .SS resolve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3102
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3103
 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
  3104
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3105
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3106
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3107
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3108
 hg resolve [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3109
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3110
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3111
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3112
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3113
 Merges with unresolved conflicts are often the result of
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3114
@@ -3964,15 +3937,15 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3115
 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
  3116
 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
  3117
 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
  3118
-\%\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
  3119
-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
  3120
-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
  3121
+\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
  3122
+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
  3123
+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
  3124
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3125
 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
  3126
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3127
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3128
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3129
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3130
-\%\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
  3131
+\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
  3132
 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
  3133
 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
  3134
 to select all unresolved files. \fB\-\-tool\fP can be used to specify
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3135
@@ -3981,22 +3954,22 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3136
 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
  3137
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3138
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3139
-\%\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
  3140
+\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
  3141
 (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
  3142
 to mark all unresolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3143
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3144
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3145
-\%\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
  3146
+\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
  3147
 default is to mark all resolved files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3148
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3149
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3150
-\%\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
  3151
+\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
  3152
 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
  3153
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3154
+.RE
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3155
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3156
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3157
 Mercurial will not let you commit files with unresolved merge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3158
-conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3159
+conflicts. You must use \fBhg resolve \-m ...\fP before you can
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3160
 commit after a conflicting merge.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3161
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3162
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3163
@@ -4003,7 +3976,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3164
 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
  3165
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3166
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3167
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3168
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3169
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3170
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3171
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3172
@@ -4040,7 +4013,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3173
 .BI \-T,  \-\-template \ <TEMPLATE>
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3174
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3175
 display with template (EXPERIMENTAL)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3176
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3177
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3178
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3179
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3180
 .SS revert
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3181
@@ -4048,15 +4021,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3182
 restore files to their checkout state:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3183
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3184
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3185
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3186
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3187
 hg revert [OPTION]... [\-r REV] [NAME]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3188
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3189
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3190
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3191
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3192
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3193
-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
  3194
+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
  3195
 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
  3196
-use \%\fBhg update \-\-clean .\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3197
+use \fBhg update \-\-clean .\fP.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  3198
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3199
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3200
 With no revision specified, revert the specified files or directories
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3201
@@ -4070,21 +4043,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3202
 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
  3203
 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
  3204
 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
  3205
-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
  3206
+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
  3207
 related method.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3208
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3209
 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
  3210
 To disable these backups, use \-\-no\-backup.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3211
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3212
-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
  3213
+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
  3214
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3215
-See \%\fBhg help backout\fP\: for a way to reverse the effect of an
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3216
+See \fBhg help backout\fP for a way to reverse the effect of an
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3217
 earlier changeset.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3218
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3219
 Returns 0 on success.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3220
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3221
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3222
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3223
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3224
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3225
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3226
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3227
@@ -4117,7 +4090,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3228
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3229
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3230
 do not perform actions, just print output
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3231
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3232
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3233
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3234
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3235
 .SS rollback
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3236
@@ -4125,12 +4098,12 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3237
 roll back the last transaction (DANGEROUS) (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3238
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3239
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3240
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3241
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3242
 hg rollback
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3243
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3244
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3245
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3246
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3247
-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
  3248
+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
  3249
 mistakes in the last commit.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3250
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3251
 This command should be used with care. There is only one level of
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3252
@@ -4145,7 +4118,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3253
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3254
 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
  3255
 effects can be rolled back:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3256
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3257
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3258
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3259
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3260
 commit
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3261
@@ -4161,10 +4134,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3262
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3263
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3264
 unbundle
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3265
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3266
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3267
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3268
 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
  3269
-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
  3270
+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
  3271
 override this protection.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3272
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3273
 This command is not intended for use on public repositories. Once
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3274
@@ -4177,7 +4150,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3275
 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
  3276
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3277
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3278
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3279
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3280
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3281
 .B \-n,  \-\-dry\-run
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3282
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3283
@@ -4186,15 +4159,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3284
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3285
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3286
 ignore safety measures
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3287
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3288
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3289
 .SS root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3290
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3291
 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
  3292
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3293
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3294
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3295
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3296
 hg root
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
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3301
 Print the root directory of the current repository.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3302
@@ -4205,9 +4178,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3303
 start stand\-alone webserver:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3304
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3305
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3306
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3307
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3308
 hg serve [OPTION]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3309
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3310
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3311
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3312
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3313
 Start a local HTTP repository browser and pull server. You can use
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3314
@@ -4232,7 +4205,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3315
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3316
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3317
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3318
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3319
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3320
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3321
 .BI \-A,  \-\-accesslog \ <FILE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3322
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3323
@@ -4301,15 +4274,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3324
 .BI \-\-certificate \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3325
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3326
 SSL certificate file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3327
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3328
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3329
 .SS status
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3330
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3331
 show changed files in the working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3332
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3333
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3334
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3335
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3336
 hg status [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3337
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3338
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3339
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3340
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3341
 Show status of files in the repository. If names are given, only
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3342
@@ -4323,7 +4296,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3343
 unless explicitly requested with \-u/\-\-unknown or \-i/\-\-ignored.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3344
 .IP Note
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3345
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3346
-\%\fBhg status\fP\: may appear to disagree with diff if permissions have
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3347
+\fBhg status\fP may appear to disagree with diff if permissions have
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3348
 changed or a merge has occurred. The standard diff format does
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3349
 not report permission changes and diff only reports changes
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3350
 relative to one merge parent.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3351
@@ -4337,7 +4310,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3352
 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
  3353
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3354
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3355
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3356
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3357
 M = modified
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3358
 A = added
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3359
 R = removed
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3360
@@ -4346,11 +4319,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3361
 ? = not tracked
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3362
 I = ignored
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3363
   = origin of the previous file (with \-\-copies)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3364
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3365
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3366
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3367
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3368
 Examples:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3369
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3370
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3371
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3372
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3373
 show changes in the working directory relative to a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3374
@@ -4357,19 +4330,19 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3375
 changeset:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3376
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3377
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3378
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3379
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3380
 hg status \-\-rev 9353
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3381
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3382
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3383
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3384
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3385
 .
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3386
 show changes in the working directory relative to the
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3387
-current directory (see \%\fBhg help patterns\fP\: for more information):
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3388
+current directory (see \fBhg help patterns\fP for more information):
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3389
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3390
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3391
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3392
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3393
 hg status re:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3394
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3395
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3396
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3397
 .IP \(bu 2
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  3398
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3399
@@ -4376,9 +4349,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3400
 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
  3401
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3402
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3403
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3404
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3405
 hg status \-\-copies \-\-change 9353
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3406
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3407
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3408
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3409
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3410
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3411
@@ -4385,16 +4358,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3412
 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
  3413
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3414
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3415
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3416
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3417
 hg status \-an0
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3418
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3419
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3420
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3421
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3422
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3423
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3424
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3425
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3426
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3427
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3428
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3429
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3430
 .B \-A,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3431
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3432
@@ -4463,23 +4436,23 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3433
 .BI \-T,  \-\-template \ <TEMPLATE>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3434
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3435
 display with template (EXPERIMENTAL)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3436
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3437
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3438
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3439
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3440
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3441
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3442
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3443
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3444
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3445
 aliases: st
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3446
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3447
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3448
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3449
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3450
 .SS summary
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3451
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3452
 summarize working directory state:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3453
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3454
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3455
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3456
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3457
 hg summary [\-\-remote]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3458
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3459
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3460
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3461
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3462
 This generates a brief summary of the working directory state,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3463
@@ -4491,7 +4464,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3464
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3465
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3466
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3467
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3468
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3469
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3470
 .B \-\-remote
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3471
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3472
@@ -4498,15 +4471,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3473
 check for push and pull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3474
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3475
 aliases: sum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3476
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3477
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3478
 .SS tag
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3479
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3480
 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
  3481
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3482
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3483
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3484
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3485
 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
  3486
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3487
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3488
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3489
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3490
 Name a particular revision using <name>.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3491
@@ -4527,11 +4500,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3492
 repositories).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3493
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3494
 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
  3495
-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
  3496
+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
  3497
 \-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
  3498
 changeset.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3499
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3500
-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
  3501
+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
  3502
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3503
 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
  3504
 lookup, using an existing branch name as a tag name is discouraged.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3505
@@ -4539,7 +4512,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3506
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3507
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3508
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3509
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3510
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3511
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3512
 .B \-f,  \-\-force
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3513
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3514
@@ -4572,15 +4545,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3515
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3516
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3517
 record the specified user as committer
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3518
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3519
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3520
 .SS tags
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3521
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3522
 list repository tags:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3523
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3524
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3525
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3526
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3527
 hg tags
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3528
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3529
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3530
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3531
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3532
 This lists both regular and local tags. When the \-v/\-\-verbose
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3533
@@ -4590,20 +4563,20 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3534
 Returns 0 on success.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3535
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3536
 Options:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3537
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3538
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3539
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3540
 .BI \-T,  \-\-template \ <TEMPLATE>
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3541
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3542
 display with template (EXPERIMENTAL)
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3543
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3544
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3545
 .SS tip
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3546
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3547
 show the tip revision (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3548
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3549
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3550
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3551
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3552
 hg tip [\-p] [\-g]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3553
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3554
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3555
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3556
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3557
 The tip revision (usually just called the tip) is the changeset
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3558
@@ -4615,12 +4588,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3559
 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
  3560
 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
  3561
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3562
-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
  3563
+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
  3564
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3565
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3566
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3567
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3568
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3569
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3570
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3571
 .B \-p,  \-\-patch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3572
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3573
@@ -4637,15 +4610,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3574
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3575
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3576
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3577
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3578
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3579
 .SS unbundle
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3580
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3581
 apply one or more changegroup files:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3582
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3583
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3584
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3585
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3586
 hg unbundle [\-u] FILE...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3587
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3588
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3589
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3590
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3591
 Apply one or more compressed changegroup files generated by the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3592
@@ -4654,32 +4627,32 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3593
 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
  3594
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3595
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3596
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3597
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3598
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3599
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3600
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3601
 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
  3602
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3603
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3604
 .SS update
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3605
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3606
 update working directory (or switch revisions):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3607
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3608
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3609
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3610
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3611
 hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3612
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3613
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3614
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3615
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3616
-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
  3617
+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
  3618
 changeset. If no changeset is specified, update to the tip of the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3619
-current named branch and move the active bookmark (see \%\fBhg help
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3620
-bookmarks\fP\:).
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3621
+current named branch and move the active bookmark (see \fBhg help
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3622
+bookmarks\fP).
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3623
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3624
-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
  3625
-changeset (see \%\fBhg help parents\fP\:).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3626
+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
  3627
+changeset (see \fBhg help parents\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3628
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3629
 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
  3630
-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
  3631
+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
  3632
 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
  3633
 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
  3634
 changeset.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3635
@@ -4686,12 +4659,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3636
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3637
 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
  3638
 uncommitted changes:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3639
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3640
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3641
 .IP 1. 3
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3642
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3643
 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
  3644
 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
  3645
-the working directory\(aqs parent, the uncommitted changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3646
+the working directory's parent, the uncommitted changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3647
 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
  3648
 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
  3649
 not an ancestor or descendant (that is, it is on another
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3650
@@ -4705,23 +4678,23 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3651
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3652
 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
  3653
 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
  3654
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3655
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3656
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3657
 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
  3658
-\%\fBhg update \-\-clean .\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3659
+\fBhg update \-\-clean .\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3660
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3661
 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
  3662
-\%\fBhg clone \-U\fP\:).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3663
+\fBhg clone \-U\fP).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3664
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3665
 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
  3666
-\%\fBhg revert [\-r REV] NAME\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3667
+\fBhg revert [\-r REV] NAME\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3668
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3669
-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
  3670
+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
  3671
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3672
 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
  3673
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3674
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3675
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3676
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3677
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3678
 .B \-C,  \-\-clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3679
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3680
@@ -4744,25 +4717,25 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  3681
 specify merge tool
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3682
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3683
 aliases: up checkout co
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3684
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3685
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3686
 .SS verify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3687
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3688
 verify the integrity of the repository:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3689
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3690
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3691
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3692
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3693
 hg verify
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3694
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3695
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3696
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3697
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3698
 Verify the integrity of the current repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3699
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3700
-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
  3701
+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
  3702
 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
  3703
 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
  3704
 integrity of their crosslinks and indices.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3705
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3706
-Please see \%https://mercurial\-scm.org/wiki/RepositoryCorruption\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3707
+Please see https://mercurial\-scm.org/wiki/RepositoryCorruption
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3708
 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
  3709
 repository.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3710
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3711
@@ -4772,9 +4745,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  3712
 output version and copyright information:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3713
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3714
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3715
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3716
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3717
 hg version
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3718
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3719
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3720
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3721
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3722
 output version and copyright information
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3723
@@ -4781,7 +4754,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3724
 .SH DATE FORMATS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3725
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3726
 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
  3727
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3728
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3729
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3730
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3731
 backout, commit, import, tag: Specify the commit date.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3732
@@ -4788,10 +4761,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3733
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3734
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3735
 log, revert, update: Select revision(s) by date.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3736
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3737
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3738
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3739
 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
  3740
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3741
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3742
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3743
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3744
 \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3745
@@ -4840,14 +4813,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3746
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3747
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3748
 \fBnow\fP \- right now
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3749
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3750
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3751
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3752
-Lastly, there is Mercurial\(aqs internal format:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3753
-.INDENT 0.0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3754
+Lastly, there is Mercurial's internal format:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3755
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3756
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3757
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3758
 \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
  3759
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3760
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3761
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3762
 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
  3763
 is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3764
@@ -4855,7 +4828,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3765
 (negative if the timezone is east of UTC).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3766
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3767
 The log command also accepts date ranges:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3768
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3769
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3770
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3771
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3772
 \fB<DATE\fP \- at or before a given date/time
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3773
@@ -4868,16 +4841,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3774
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3775
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3776
 \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
  3777
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3778
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3779
 .SH DIFF FORMATS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3780
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3781
-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
  3782
+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
  3783
 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
  3784
 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
  3785
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3786
 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
  3787
 following information:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3788
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3789
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3790
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3791
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3792
 executable status and other permission bits
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3793
@@ -4890,7 +4863,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3794
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3795
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3796
 creation or deletion of empty files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3797
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3798
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3799
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3800
 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
  3801
 which addresses these limitations. The git diff format is not produced
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3802
@@ -4898,26 +4871,26 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3803
 format.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3804
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3805
 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
  3806
-(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
  3807
+(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
  3808
 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
  3809
 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
  3810
-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
  3811
+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
  3812
 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
  3813
 format for communicating changes.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3814
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3815
 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
  3816
-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
  3817
+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
  3818
 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
  3819
 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
  3820
 .SH ENVIRONMENT VARIABLES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3821
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3822
+.RS 0
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3823
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3824
 .B HG
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3825
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3826
-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
  3827
+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
  3828
 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
  3829
-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
  3830
-\(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
  3831
+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
  3832
+\&'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
  3833
 Windows) is searched.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3834
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3835
 .B HGEDITOR
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3836
@@ -4935,9 +4908,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3837
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3838
 .B HGENCODINGMODE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3839
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3840
-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
  3841
+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
  3842
 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
  3843
-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
  3844
+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
  3845
 settings include "replace", which replaces unknown characters, and
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3846
 "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
  3847
 the \-\-encodingmode command\-line option.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3848
@@ -4944,7 +4917,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3849
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3850
 .B HGENCODINGAMBIGUOUS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3851
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3852
-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
  3853
+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
  3854
 "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
  3855
 fonts. By default, Mercurial assumes ambiguous characters are
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3856
 narrow, set this variable to "wide" if such characters cause
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3857
@@ -4966,19 +4939,19 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3858
 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
  3859
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3860
 For each element in HGRCPATH:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3861
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3862
+.RS 7
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3863
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3864
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3865
-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
  3866
+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
  3867
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3868
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3869
 otherwise, the file itself will be added
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3870
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3871
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3872
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3873
 .B HGPLAIN
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3874
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3875
 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
  3876
-change Mercurial\(aqs default output. This includes encoding,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3877
+change Mercurial's default output. This includes encoding,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3878
 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
  3879
 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
  3880
 in the face of existing user configuration.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3881
@@ -4990,11 +4963,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3882
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3883
 This is a comma\-separated list of features to preserve when
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3884
 HGPLAIN is enabled. Currently the following values are supported:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3885
-.INDENT 7.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3886
+.RS 7
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3887
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3888
 .B \fBalias\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3889
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3890
-Don\(aqt remove aliases.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3891
+Don't remove aliases.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3892
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3893
 .B \fBi18n\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3894
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3895
@@ -5002,8 +4975,8 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3896
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3897
 .B \fBrevsetalias\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3898
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3899
-Don\(aqt remove revset aliases.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3900
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3901
+Don't remove revset aliases.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3902
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3903
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3904
 Setting HGPLAINEXCEPT to anything (even an empty string) will
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3905
 enable plain mode.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3906
@@ -5012,7 +4985,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3907
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3908
 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
  3909
 available values will be considered in this order:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3910
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3911
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3912
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3913
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3914
 HGUSER (deprecated)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3915
@@ -5028,7 +5001,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3916
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3917
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3918
 LOGNAME (with \fB@hostname\fP appended)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3919
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3920
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3921
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3922
 (deprecated, use configuration file)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3923
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3924
@@ -5051,13 +5024,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3925
 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
  3926
 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
  3927
 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
  3928
-defaults to \(aqvi\(aq.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3929
+defaults to 'vi'.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3930
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3931
 .B PYTHONPATH
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  3932
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3933
 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
  3934
 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
  3935
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3936
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3937
 .SH USING ADDITIONAL FEATURES
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3938
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3939
 Mercurial has the ability to add new features through the use of
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3940
@@ -5070,22 +5043,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3941
 like this:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3942
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3943
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3944
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3945
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3946
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3947
 foo =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3948
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3949
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3950
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3951
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3952
 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
  3953
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3954
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3955
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3956
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3957
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3958
 myfeature = ~/.hgext/myfeature.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3959
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3960
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3961
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3962
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3963
-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
  3964
+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
  3965
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3966
 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
  3967
 they can increase startup overhead; they may be meant for advanced
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3968
@@ -5099,19 +5072,19 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3969
 broader scope, prepend its path with !:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3970
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3971
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3972
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3973
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3974
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3975
 # 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
  3976
 bar = !/path/to/extension/bar.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3977
 # 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
  3978
 baz = !
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3979
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3980
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3981
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3982
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  3983
 disabled extensions:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3984
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3985
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3986
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3987
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3988
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3989
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3990
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3991
 .B acl
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3992
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  3993
@@ -5244,9 +5217,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3994
 .B zeroconf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3995
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3996
 discover and advertise repositories on the local network
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3997
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3998
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  3999
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4000
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4001
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4002
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4003
 .SH SPECIFYING FILE SETS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4004
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4005
 Mercurial supports a functional language for selecting a set of
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4006
@@ -5253,7 +5226,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4007
 files.
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
 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
  4010
-\(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
  4011
+\&'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
  4012
 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
  4013
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4014
 Identifiers such as filenames or patterns must be quoted with single
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4015
@@ -5264,18 +5237,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4016
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4017
 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
  4018
 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
  4019
-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
  4020
+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
  4021
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4022
 There is a single prefix operator:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4023
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4024
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4025
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4026
 .B \fBnot x\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4027
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4028
 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
  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
 These are the supported infix operators:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4033
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4034
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4035
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4036
 .B \fBx and y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4037
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4038
@@ -5289,14 +5262,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4039
 .B \fBx \- y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4040
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4041
 Files in x but not in y.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4042
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4043
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4044
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4045
 The following predicates are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4046
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4047
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4048
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4049
 .B \fBadded()\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4050
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4051
-File that is added according to \%\fBhg status\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4052
+File that is added according to \fBhg status\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4053
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4054
 .B \fBbinary()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4055
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4056
@@ -5304,7 +5277,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4057
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4058
 .B \fBclean()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4059
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4060
-File that is clean according to \%\fBhg status\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4061
+File that is clean according to \fBhg status\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4062
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4063
 .B \fBcopied()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4064
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4065
@@ -5340,34 +5313,34 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4066
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4067
 .B \fBignored()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4068
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4069
-File that is ignored according to \%\fBhg status\fP\:. These files will only be
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4070
+File that is ignored according to \fBhg status\fP. These files will only be
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4071
 considered if this predicate is used.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4072
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4073
 .B \fBmissing()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4074
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4075
-File that is missing according to \%\fBhg status\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4076
+File that is missing according to \fBhg status\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4077
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4078
 .B \fBmodified()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4079
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4080
-File that is modified according to \%\fBhg status\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4081
+File that is modified according to \fBhg status\fP.
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4082
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4083
 .B \fBportable()\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4084
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4085
-File that has a portable name. (This doesn\(aqt include filenames with case
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4086
+File that has a portable name. (This doesn't include filenames with case
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4087
 collisions.)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4088
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4089
 .B \fBremoved()\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4090
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4091
-File that is removed according to \%\fBhg status\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4092
+File that is removed according to \fBhg status\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4093
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4094
 .B \fBresolved()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4095
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4096
-File that is marked resolved according to \%\fBhg resolve \-l\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4097
+File that is marked resolved according to \fBhg resolve \-l\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4098
 .TP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4099
 .B \fBsize(expression)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4100
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4101
 File size matches the given expression. Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4102
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4103
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4104
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4105
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4106
 1k (files from 1024 to 2047 bytes)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4107
@@ -5380,7 +5353,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4108
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4109
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4110
 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
  4111
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4112
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4113
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4114
 .B \fBsubrepo([pattern])\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4115
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4116
@@ -5392,24 +5365,24 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4117
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4118
 .B \fBunknown()\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4119
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4120
-File that is unknown according to \%\fBhg status\fP\:. These files will only be
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4121
+File that is unknown according to \fBhg status\fP. These files will only be
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4122
 considered if this predicate is used.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4123
 .TP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4124
 .B \fBunresolved()\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4125
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4126
-File that is marked unresolved according to \%\fBhg resolve \-l\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4127
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4128
+File that is marked unresolved according to \fBhg resolve \-l\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4129
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4130
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4131
 Some sample queries:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4132
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4133
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4134
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4135
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4136
 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
  4137
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4138
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4139
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4140
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4141
 hg status \-A "set:binary()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4142
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4143
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4144
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4145
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4146
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4147
@@ -5416,9 +5389,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4148
 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
  4149
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4150
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4151
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4152
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4153
 hg forget "set:hgignore() and not ignored()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4154
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4155
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4156
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4157
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4158
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4159
@@ -5425,9 +5398,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4160
 Find text files that contain a string:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4161
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4162
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4163
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4164
+.ft
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4165
 hg files "set:grep(magic) and not binary()"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4166
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4167
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4168
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4169
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4170
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4171
@@ -5434,9 +5407,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4172
 Find C files in a non\-standard encoding:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4173
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4174
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4175
-.ft C
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4176
-hg files "set:**.c and not encoding(\(aqUTF\-8\(aq)"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4177
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4178
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4179
+hg files "set:**.c and not encoding('UTF\-8')"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4180
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4181
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4182
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4183
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4184
@@ -5443,9 +5416,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4185
 Revert copies of large binary files:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4186
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4187
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4188
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4189
-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
  4190
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4191
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4192
+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
  4193
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4194
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4195
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4196
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4197
@@ -5452,15 +5425,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4198
 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
  4199
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4200
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4201
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4202
-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
  4203
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4204
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4205
+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
  4206
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4207
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4208
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4209
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4210
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4211
-See also \%\fBhg help patterns\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4212
+See also \fBhg help patterns\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4213
 .SH GLOSSARY
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4214
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4215
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4216
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4217
 .B Ancestor
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4218
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4219
@@ -5468,7 +5441,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4220
 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
  4221
 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
  4222
 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
  4223
-ancestor. See also: \(aqDescendant\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4224
+ancestor. See also: 'Descendant'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4225
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4226
 .B Bookmark
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4227
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4228
@@ -5475,7 +5448,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4229
 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
  4230
 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
  4231
 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
  4232
-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
  4233
+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
  4234
 when you make a commit.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4235
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4236
 Bookmarks can be renamed, copied and deleted. Bookmarks are local,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4237
@@ -5487,9 +5460,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4238
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4239
 (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
  4240
 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
  4241
-\(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
  4242
+\&'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
  4243
 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
  4244
-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
  4245
+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
  4246
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4247
 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
  4248
 a remote repository, since new heads may be created by these
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4249
@@ -5504,7 +5477,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4250
 (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
  4251
 its parent having more than one child.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4252
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4253
-Example: "I\(aqm going to branch at X."
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4254
+Example: "I'm going to branch at X."
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4255
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4256
 .B Branch, anonymous
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4257
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4258
@@ -5523,19 +5496,19 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4259
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4260
 .B Branch head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4261
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4262
-See \(aqHead, branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4263
+See 'Head, branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4264
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4265
 .B Branch, inactive
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4266
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4267
 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
  4268
 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
  4269
-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
  4270
+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
  4271
 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
  4272
-\%\fBhg branches \-\-active\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4273
+\fBhg branches \-\-active\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4274
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4275
 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
  4276
-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
  4277
-\-\-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
  4278
+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
  4279
+\-\-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
  4280
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4281
 .B Branch, named
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4282
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4283
@@ -5542,8 +5515,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4284
 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
  4285
 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
  4286
 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
  4287
-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
  4288
-\%\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
  4289
+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
  4290
+\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
  4291
 branches.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4292
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4293
 Named branches can be thought of as a kind of namespace, dividing
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4294
@@ -5556,7 +5529,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4295
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4296
 .B Branch tip
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4297
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4298
-See \(aqTip, branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4299
+See 'Tip, branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4300
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4301
 .B Branch, topological
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4302
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4303
@@ -5606,24 +5579,24 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4304
 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
  4305
 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
  4306
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4307
-Example: "I\(aqm using checkout X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4308
+Example: "I'm using checkout X."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4309
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4310
 (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
  4311
-\%\fBhg help update\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4312
+\fBhg help update\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4313
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4314
-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
  4315
+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
  4316
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4317
 .B Child changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4318
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4319
-See \(aqChangeset, child\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4320
+See 'Changeset, child'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4321
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4322
 .B Close changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4323
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4324
-See \(aqHead, closed branch\(aq.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4325
+See 'Head, closed branch'.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4326
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4327
 .B Closed branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4328
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4329
-See \(aqBranch, closed\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4330
+See 'Branch, closed'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4331
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4332
 .B Clone
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4333
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4334
@@ -5632,13 +5605,13 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4335
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4336
 Example: "Is your clone up to date?"
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4337
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4338
-(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
  4339
+(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
  4340
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4341
-Example: "I\(aqm going to clone the repository."
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4342
+Example: "I'm going to clone the repository."
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4343
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4344
 .B Closed branch head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4345
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4346
-See \(aqHead, closed branch\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4347
+See 'Head, closed branch'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4348
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4349
 .B Commit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4350
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4351
@@ -5663,7 +5636,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4352
 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
  4353
 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
  4354
 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
  4355
-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
  4356
+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
  4357
 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
  4358
 have at most two parents.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4359
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4360
@@ -5673,7 +5646,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4361
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4362
 .B Default branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4363
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4364
-See \(aqBranch, default\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4365
+See 'Branch, default'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4366
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4367
 .B Descendant
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4368
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4369
@@ -5681,7 +5654,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4370
 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
  4371
 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
  4372
 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
  4373
-descendant. See also: \(aqAncestor\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4374
+descendant. See also: 'Ancestor'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4375
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4376
 .B Diff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4377
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4378
@@ -5706,7 +5679,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4379
 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
  4380
 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
  4381
 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
  4382
-\(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
  4383
+\&'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
  4384
 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
  4385
 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
  4386
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4387
@@ -5714,7 +5687,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4388
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4389
 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
  4390
 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
  4391
-extensions. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4392
+extensions. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4393
 .TP
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4394
 .B Experimental
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4395
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4396
@@ -5722,13 +5695,13 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4397
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4398
 .B Graph
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4399
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4400
-See DAG and \%\fBhg log \-\-graph\fP\:.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4401
+See DAG and \fBhg log \-\-graph\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4402
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4403
 .B Head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4404
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4405
-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
  4406
-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
  4407
-\(aqHead, repository\(aq for specific definitions.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4408
+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
  4409
+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
  4410
+\&'Head, repository' for specific definitions.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4411
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4412
 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
  4413
 usual targets for update and merge operations.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4414
@@ -5740,9 +5713,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4415
 .B Head, closed branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4416
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4417
 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
  4418
-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
  4419
+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
  4420
 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
  4421
-listed by \%\fBhg branches\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4422
+listed by \fBhg branches\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4423
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4424
 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
  4425
 child of the changeset that marks a head as closed.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4426
@@ -5771,11 +5744,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4427
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4428
 .B Immutable history
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4429
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4430
-See \(aqHistory, immutable\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4431
+See 'History, immutable'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4432
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4433
 .B Merge changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4434
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4435
-See \(aqChangeset, merge\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4436
+See 'Changeset, merge'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4437
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4438
 .B Manifest
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4439
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4440
@@ -5792,7 +5765,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4441
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4442
 .B Named branch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4443
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4444
-See \(aqBranch, named\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4445
+See 'Branch, named'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4446
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4447
 .B Null changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4448
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4449
@@ -5799,30 +5772,30 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4450
 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
  4451
 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
  4452
 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
  4453
-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
  4454
-or by the changeset ID \(aq000000000000\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4455
+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
  4456
+or by the changeset ID '000000000000'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4457
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4458
 .B Parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4459
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4460
-See \(aqChangeset, parent\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4461
+See 'Changeset, parent'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4462
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4463
 .B Parent changeset
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4464
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4465
-See \(aqChangeset, parent\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4466
+See 'Changeset, parent'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4467
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4468
 .B Parent, working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4469
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4470
 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
  4471
 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
  4472
-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
  4473
-\%\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
  4474
-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
  4475
+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
  4476
+\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
  4477
+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
  4478
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4479
 .B Patch
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4480
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4481
 (Noun) The product of a diff operation.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4482
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4483
-Example: "I\(aqve sent you my patch."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4484
+Example: "I've sent you my patch."
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4485
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4486
 (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
  4487
 changeset into another.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4488
@@ -5832,13 +5805,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4489
 .B Phase
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4490
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4491
 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
  4492
-should be shared. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4493
+should be shared. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4494
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4495
 .B Public
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4496
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4497
 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
  4498
-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
  4499
-phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4500
+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
  4501
+phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4502
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4503
 .B Pull
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4504
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4505
@@ -5846,7 +5819,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4506
 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
  4507
 repository. Note that this operation without special arguments
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4508
 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
  4509
-working directory. See \%\fBhg help pull\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4510
+working directory. See \fBhg help pull\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4511
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4512
 .B Push
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4513
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4514
@@ -5854,7 +5827,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4515
 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
  4516
 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
  4517
 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
  4518
-sent. See \%\fBhg help push\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4519
+sent. See \fBhg help push\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4520
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4521
 .B Repository
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4522
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4523
@@ -5867,13 +5840,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4524
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4525
 .B Repository head
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4526
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4527
-See \(aqHead, repository\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4528
+See 'Head, repository'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4529
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4530
 .B Revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4531
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4532
 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
  4533
-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
  4534
-number\(aq; See also \(aqChangeset\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4535
+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
  4536
+number'; See also 'Changeset'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4537
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4538
 .B Revision number
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4539
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4540
@@ -5882,7 +5855,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4541
 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
  4542
 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
  4543
 identify changesets uniquely between different clones, see
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4544
-\(aqChangeset id\(aq.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4545
+\&'Changeset id'.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4546
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4547
 .B Revlog
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4548
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4549
@@ -5893,7 +5866,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4550
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4551
 .B Rewriting history
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4552
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4553
-See \(aqHistory, rewriting\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4554
+See 'History, rewriting'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4555
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4556
 .B Root
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4557
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4558
@@ -5903,13 +5876,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4559
 .B Secret
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4560
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4561
 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
  4562
-or clone. See \%\fBhg help phases\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4563
+or clone. See \fBhg help phases\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4564
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4565
 .B Tag
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4566
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4567
 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
  4568
 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
  4569
-\%\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
  4570
+\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
  4571
 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
  4572
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4573
 .B Tip
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4574
@@ -5921,7 +5894,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4575
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4576
 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
  4577
 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
  4578
-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
  4579
+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
  4580
 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
  4581
 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
  4582
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4583
@@ -5929,22 +5902,22 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4584
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4585
 (Noun) Another synonym of changeset.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4586
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4587
-Example: "I\(aqve pushed an update."
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4588
+Example: "I've pushed an update."
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4589
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4590
 (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
  4591
 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
  4592
-\%\fBhg help update\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4593
+\fBhg help update\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4594
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4595
 Example: "You should update."
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4596
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4597
 .B Working directory
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4598
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4599
-See \(aqDirectory, working\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4600
+See 'Directory, working'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4601
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4602
 .B Working directory parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4603
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4604
-See \(aqParent, working directory\(aq.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4605
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  4606
+See 'Parent, working directory'.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4607
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4608
 .SH SYNTAX FOR MERCURIAL IGNORE FILES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4609
 .SS Synopsis
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4610
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4611
@@ -5971,16 +5944,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4612
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4613
 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
  4614
 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
  4615
-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
  4616
+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
  4617
 configure these files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4618
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4619
-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
  4620
+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
  4621
 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
  4622
-\%\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
  4623
+\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
  4624
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4625
 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
  4626
 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
  4627
-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
  4628
+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
  4629
 in .hgignore.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4630
 .SS Syntax
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4631
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4632
@@ -5995,13 +5968,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4633
 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
  4634
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4635
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4636
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4637
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4638
 syntax: NAME
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4639
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4640
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4641
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4642
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4643
 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
  4644
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4645
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4646
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4647
 .B \fBregexp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4648
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4649
@@ -6010,7 +5983,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4650
 .B \fBglob\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4651
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4652
 Shell\-style glob.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4653
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4654
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4655
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4656
 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
  4657
 follow, until another syntax is selected.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4658
@@ -6022,11 +5995,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4659
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4660
 Subdirectories can have their own .hgignore settings by adding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4661
 \fBsubinclude:path/to/subdir/.hgignore\fP to the root \fB.hgignore\fP. See
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4662
-\%\fBhg help patterns\fP\: for details on \fBsubinclude:\fP and \fBinclude:\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4663
+\fBhg help patterns\fP for details on \fBsubinclude:\fP and \fBinclude:\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4664
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4665
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4666
 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
  4667
-Please see \%\fBhg help patterns\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4668
+Please see \fBhg help patterns\fP for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4669
 .RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4670
 .SS Example
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4671
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4672
@@ -6033,7 +6006,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4673
 Here is an example ignore file.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4674
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4675
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4676
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4677
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4678
 # use glob syntax.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4679
 syntax: glob
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4680
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4681
@@ -6044,21 +6017,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4682
 # switch to regexp syntax.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4683
 syntax: regexp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4684
 ^\e.pc/
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4685
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4686
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4687
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4688
 .SH CONFIGURING HGWEB
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
-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
  4691
+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
  4692
 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
  4693
 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
  4694
-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
  4695
+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
  4696
 \fBhgweb.cgi\fP and \fBhgweb.fcgi\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4697
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4698
 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
  4699
 but recognizes only the following sections:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4700
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4701
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4702
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4703
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4704
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4705
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4706
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4707
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4708
 web
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4709
@@ -6068,11 +6041,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4710
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4711
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4712
 collections
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4713
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4714
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4715
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4716
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4717
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4718
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4719
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4720
-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
  4721
+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
  4722
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4723
 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
  4724
 filesystem. hgweb will not expose the filesystem directly \- only
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4725
@@ -6087,7 +6060,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4726
 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
  4727
 recursively for repositories below that point.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4728
 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
  4729
-\fB.hg/patches\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4730
+\fB\&.hg/patches\fP).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4731
 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
  4732
 and possibly find subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4733
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4734
@@ -6094,15 +6067,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4735
 In this example:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4736
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4737
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4738
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4739
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4740
 [paths]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4741
 /projects/a = /srv/tmprepos/a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4742
 /projects/b = c:/repos/b
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4743
 / = /srv/repos/*
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4744
 /user/bob = /home/bob/repos/**
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4745
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4746
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4747
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4748
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4749
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4750
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4751
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4752
 The first two entries make two repositories in different directories
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4753
@@ -6116,7 +6089,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4754
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4755
 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
  4756
 and \fBhttp://server/user/bob/quux/testsubrepo/\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4757
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4758
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4759
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4760
 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
  4761
 \fBpaths\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4762
@@ -6139,7 +6112,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4763
 \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4764
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4765
 Not all templates are available for all styles. Attempting to use
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4766
-a style that doesn\(aqt have all templates defined may result in an error
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4767
+a style that doesn't have all templates defined may result in an error
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4768
 rendering the page.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4769
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4770
 Many commands take a \fB{revision}\fP URL parameter. This defines the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4771
@@ -6146,7 +6119,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4772
 changeset to operate on. This is commonly specified as the short,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4773
 12 digit hexadecimal abbreviation for the full 40 character unique
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4774
 revision identifier. However, any value described by
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4775
-\%\fBhg help revisions\fP\: typically works.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4776
+\fBhg help revisions\fP typically works.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4777
 .SS Commands and URLs
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4778
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4779
 The following web commands and their URLs are available:
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4780
@@ -6200,7 +6173,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4781
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4782
 The argument for \fBrev\fP can be a single revision, a revision set,
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4783
 or a literal keyword to search for in changeset data (equivalent to
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4784
-\%\fBhg log \-k\fP\:).
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4785
+\fBhg log \-k\fP).
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4786
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4787
 The \fBrevcount\fP query string argument defines the maximum numbers of
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4788
 changesets to render.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4789
@@ -6285,7 +6258,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4790
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4791
 Render help documentation.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4792
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4793
-This web command is roughly equivalent to \%\fBhg help\fP\:. If a \fBtopic\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4794
+This web command is roughly equivalent to \fBhg help\fP. If a \fBtopic\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4795
 is defined, that help topic will be rendered. If not, an index of
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4796
 available help topics will be rendered.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  4797
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4798
@@ -6348,9 +6321,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4799
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4800
 The \fBtags\fP template is rendered.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4801
 .SH TECHNICAL IMPLEMENTATION TOPICS
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4802
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4803
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4804
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4805
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4806
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4807
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4808
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4809
 .B bundles
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4810
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4811
@@ -6363,9 +6336,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4812
 .B revlogs
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4813
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4814
 revision storage mechanism
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4815
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4816
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4817
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4818
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4819
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4820
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4821
 .SH MERGE TOOLS
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4822
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4823
 To merge files Mercurial uses merge tools.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4824
@@ -6375,8 +6348,8 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4825
 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
  4826
 made on both branches.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4827
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4828
-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
  4829
-\%\fBhg backout\fP\: and in several extensions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4830
+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
  4831
+\fBhg backout\fP and in several extensions.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4832
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4833
 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
  4834
 combining all non\-overlapping changes that occurred separately in
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4835
@@ -6401,7 +6374,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4836
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4837
 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
  4838
 merge tools are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4839
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4840
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4841
 .TP
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4842
 .B \fB:dump\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  4843
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4844
@@ -6464,7 +6437,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4845
 Uses the internal non\-interactive simple merge algorithm for merging
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4846
 files. It will use both left and right sides for conflict regions.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4847
 No markers are inserted.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4848
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4849
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4850
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4851
 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
  4852
 not handle symlinks or binary files.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4853
@@ -6471,7 +6444,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4854
 .SS Choosing a merge tool
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4855
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4856
 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
  4857
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4858
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4859
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4860
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4861
 If a tool has been specified with the \-\-tool option to merge or resolve, it
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4862
@@ -6508,11 +6481,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4863
 .IP 8. 3
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4864
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4865
 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
  4866
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4867
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4868
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4869
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4870
 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
  4871
-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
  4872
+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
  4873
 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
  4874
 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
  4875
 controlled by the premerge setting of the merge tool. Premerge is enabled by
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4876
@@ -6548,7 +6521,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4877
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4878
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4879
 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
  4880
-Please see \%\fBhg help hgignore\fP\: for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4881
+Please see \fBhg help hgignore\fP for details.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4882
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4883
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4884
 To use a plain path name without any pattern matching, start it with
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4885
@@ -6573,8 +6546,8 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4886
 To read a set of patterns from a file, use \fBinclude:\fP or \fBsubinclude:\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4887
 \fBinclude:\fP will use all the patterns from the given file and treat them as if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4888
 they had been passed in manually.  \fBsubinclude:\fP will only apply the patterns
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4889
-against files that are under the subinclude file\(aqs directory. See \%\fBhg help
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4890
-hgignore\fP\: for details on the format of these files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4891
+against files that are under the subinclude file's directory. See \fBhg help
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4892
+hgignore\fP for details on the format of these files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4893
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4894
 All patterns, except for \fBglob:\fP specified in command line (not for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4895
 \fB\-I\fP or \fB\-X\fP options), can match also against directories: files
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4896
@@ -6583,17 +6556,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4897
 Plain examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4898
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4899
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4900
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4901
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4902
 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
  4903
                of the repository
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4904
 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
  4905
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4906
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4907
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4908
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4909
 Glob examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4910
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4911
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4912
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4913
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4914
 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
  4915
 *.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
  4916
 **.c           any name ending in ".c" in any subdirectory of the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4917
@@ -6601,36 +6574,36 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4918
 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
  4919
 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
  4920
                including itself.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4921
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4922
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4923
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4924
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4925
 Regexp examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4926
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4927
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4928
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4929
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4930
 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
  4931
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4932
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4933
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4934
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4935
 File examples:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4936
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4937
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4938
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4939
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4940
 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
  4941
 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
  4942
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4943
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4944
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4945
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4946
-See also \%\fBhg help filesets\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4947
+See also \fBhg help filesets\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4948
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4949
 Include examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4950
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4951
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4952
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4953
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4954
 include:path/to/mypatternfile    reads patterns to be applied to all paths
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4955
 subinclude:path/to/subignorefile reads patterns specifically for paths in the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4956
                                  subdirectory
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4957
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4958
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4959
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4960
 .SH WORKING WITH PHASES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4961
 .SS What are phases?
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4962
@@ -6640,9 +6613,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4963
 (for instance, with the mq or rebase extensions).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4964
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4965
 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
  4966
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4967
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4968
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4969
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4970
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4971
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4972
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4973
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4974
 public : changeset is visible on a public server
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4975
@@ -6652,9 +6625,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4976
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4977
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4978
 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
  4979
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4980
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4981
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4982
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4983
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4984
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4985
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  4986
 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
  4987
 can be in a lower phase than its ancestors. For instance, if a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4988
@@ -6668,17 +6641,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4989
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  4990
 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
  4991
 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
  4992
-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
  4993
-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
  4994
+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
  4995
+if needed. See \fBhg help \-v phase\fP for examples.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4996
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4997
 To make yours commits secret by default, put this in your
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4998
 configuration file:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  4999
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5000
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5001
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5002
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5003
 [phases]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5004
 new\-commit = secret
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5005
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5006
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5007
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5008
 .SS Phases and servers
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5009
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5010
@@ -6685,7 +6658,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5011
 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
  5012
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5013
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5014
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5015
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5016
 \- 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
  5017
 public on the client
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5018
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5019
@@ -6693,7 +6666,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5020
 client and server
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5021
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5022
 \- secret changesets are neither pushed, pulled, or cloned
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5023
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5024
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5025
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5026
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5027
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5028
@@ -6706,13 +6679,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5029
 repository to disable publishing in its configuration file:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5030
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5031
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5032
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5033
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5034
 [phases]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5035
 publish = False
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5036
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5037
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5038
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5039
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5040
-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
  5041
+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
  5042
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5043
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5044
 Servers running older versions of Mercurial are treated as
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5045
@@ -6726,17 +6699,17 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5046
 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
  5047
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5048
 .SS Examples
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5049
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5050
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5051
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5052
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5053
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5054
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5055
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5056
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5057
 list changesets in draft or secret phase:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5058
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5059
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5060
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5061
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5062
 hg log \-r "not public()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5063
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5064
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5065
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5066
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5067
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5068
@@ -6743,9 +6716,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5069
 change all secret changesets to draft:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5070
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5071
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5072
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5073
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5074
 hg phase \-\-draft "secret()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5075
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5076
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5077
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5078
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5079
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5080
@@ -6752,9 +6725,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5081
 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
  5082
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5083
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5084
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5085
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5086
 hg phase \-\-force \-\-draft .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5087
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5088
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5089
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5090
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5091
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5092
@@ -6761,9 +6734,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5093
 show a list of changeset revision and phase:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5094
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5095
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5096
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5097
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5098
 hg log \-\-template "{rev} {phase}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5099
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5100
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5101
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5102
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5103
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5104
@@ -6770,15 +6743,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5105
 resynchronize draft changesets relative to a remote repository:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5106
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5107
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5108
-.ft C
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5109
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5110
 hg phase \-fd "outgoing(URL)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5111
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5112
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5113
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5114
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5115
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5116
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5117
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5118
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5119
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5120
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5121
-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
  5122
+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
  5123
 .SH SPECIFYING SINGLE REVISIONS
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5124
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5125
 Mercurial supports several ways to specify individual revisions.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5126
@@ -6824,18 +6797,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5127
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5128
 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
  5129
 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
  5130
-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
  5131
+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
  5132
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5133
 There is a single prefix operator:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5134
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5135
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5136
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5137
 .B \fBnot x\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5138
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5139
 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
  5140
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5141
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5142
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5143
 These are the supported infix operators:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5144
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5145
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5146
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5147
 .B \fBx::y\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5148
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5149
@@ -6874,18 +6847,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5150
 .B \fBx~n\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5151
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5152
 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
  5153
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5154
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5155
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5156
 There is a single postfix operator:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5157
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5158
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5159
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5160
 .B \fBx^\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5161
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5162
 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
  5163
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5164
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5165
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5166
 The following predicates are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5167
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5168
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5169
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5170
 .B \fBadds(pattern)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5171
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5172
@@ -6918,7 +6891,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5173
 .B \fBbisect(string)\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5174
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5175
 Changesets marked in the specified bisect status:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5176
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5177
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5178
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5179
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5180
 \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5181
@@ -6940,7 +6913,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5182
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5183
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5184
 \fBcurrent\fP            : the cset currently being bisected
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5185
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5186
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5187
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5188
 .B \fBbookmark([name])\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5189
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5190
@@ -6985,8 +6958,8 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5191
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5192
 .B \fBcontains(pattern)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5193
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5194
-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
  5195
-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
  5196
+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
  5197
+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
  5198
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5199
 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
  5200
 relative to the current directory and match against a file exactly
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5201
@@ -6999,7 +6972,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5202
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5203
 .B \fBdate(interval)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5204
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5205
-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
  5206
+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
  5207
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5208
 .B \fBdesc(string)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5209
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5210
@@ -7051,7 +7024,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5211
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5212
 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
  5213
 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
  5214
-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
  5215
+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
  5216
 result, use \fBfile()\fP.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5217
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5218
 The pattern without explicit kind like \fBglob:\fP is expected to be
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5219
@@ -7058,7 +7031,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5220
 relative to the current directory and match against a file exactly
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5221
 for efficiency.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5222
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5223
-If some linkrev points to revisions filtered by the current repoview, we\(aqll
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5224
+If some linkrev points to revisions filtered by the current repoview, we'll
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5225
 work around it to return a non\-filtered value.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5226
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5227
 .B \fBfirst(set, [n])\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5228
@@ -7067,13 +7040,13 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5229
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5230
 .B \fBfollow([pattern])\fP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5231
 .sp
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5232
-An alias for \fB::.\fP (ancestors of the working directory\(aqs first parent).
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5233
+An alias for \fB::.\fP (ancestors of the working directory's first parent).
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5234
 If pattern is specified, the histories of files matching given
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5235
 pattern is followed, including copies.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5236
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5237
 .B \fBgrep(regex)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5238
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5239
-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
  5240
+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
  5241
 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
  5242
 \fBkeyword(string)\fP, the match is case\-sensitive.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5243
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5244
@@ -7197,7 +7170,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5245
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5246
 .B \fBpresent(set)\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5247
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5248
-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
  5249
+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
  5250
 all revisions in set.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5251
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5252
 If any of specified revisions is not present in the local repository,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5253
@@ -7211,7 +7184,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5254
 .B \fBremote([id [,path]])\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5255
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5256
 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
  5257
-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
  5258
+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
  5259
 synonym for the current local branch.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5260
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5261
 .B \fBremoves(pattern)\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5262
@@ -7244,7 +7217,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5263
 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
  5264
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5265
 The keys can be:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5266
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5267
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5268
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5269
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5270
 \fBrev\fP for the revision number,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5271
@@ -7260,7 +7233,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5272
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5273
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5274
 \fBdate\fP for the commit date
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5275
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5276
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5277
 .TP
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5278
 .B \fBsubrepo([pattern])\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5279
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5280
@@ -7286,15 +7259,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5281
 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
  5282
 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
  5283
 the prefix \fIliteral:\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5284
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5285
+.RE
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
 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
  5288
 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
  5289
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5290
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5291
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5292
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5293
 <alias> = <definition>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5294
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5295
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5296
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5297
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5298
 in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5299
@@ -7304,12 +7277,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5300
 For example,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5301
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5302
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5303
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5304
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5305
 [revsetalias]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5306
 h = heads()
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5307
 d($1) = sort($1, date)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5308
 rs($1, $2) = reverse(sort($1, $2))
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5309
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5310
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5311
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5312
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5313
 defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5314
@@ -7319,13 +7292,13 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5315
 one string. For example:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5316
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5317
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5318
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5319
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5320
 [revsetalias]
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5321
-issue($1) = grep(r\(aq\ebissue[ :]?\(aq ## $1 ## r\(aq\eb|\ebbug\e(\(aq ## $1 ## r\(aq\e)\(aq)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5322
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5323
+issue($1) = grep(r'\ebissue[ :]?' ## $1 ## r'\eb|\ebbug\e(' ## $1 ## r'\e)')
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5324
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5325
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5326
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5327
-\fBissue(1234)\fP is equivalent to \fBgrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5328
+\fBissue(1234)\fP is equivalent to \fBgrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5329
 in this case. This matches against all of "issue 1234", "issue:1234",
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5330
 "issue1234" and "bug(1234)".
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5331
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5332
@@ -7332,10 +7305,10 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5333
 All other prefix, infix and postfix operators have lower priority than
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5334
 \fB##\fP. For example, \fB$1 ## $2~2\fP is equivalent to \fB($1 ## $2)~2\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5335
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5336
-Command line equivalents for \%\fBhg log\fP\::
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5337
+Command line equivalents for \fBhg log\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5338
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5339
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5340
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5341
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5342
 \-f    \->  ::.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5343
 \-d x  \->  date(x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5344
 \-k x  \->  keyword(x)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5345
@@ -7344,19 +7317,19 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5346
 \-b x  \->  branch(x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5347
 \-P x  \->  !::x
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5348
 \-l x  \->  limit(expr, x)
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5349
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5350
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5351
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5352
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5353
 Some sample queries:
1637
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
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5357
 .
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5358
 Changesets on the default branch:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5359
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5360
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5361
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5362
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5363
 hg log \-r "branch(default)"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5364
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5365
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5366
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5367
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5368
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5369
@@ -7363,9 +7336,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5370
 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
  5371
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5372
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5373
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5374
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5375
 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
  5376
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5377
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5378
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5379
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5380
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5381
@@ -7372,9 +7345,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5382
 Open branch heads:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5383
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5384
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5385
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5386
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5387
 hg log \-r "head() and not closed()"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5388
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5389
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5390
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5391
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5392
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5393
@@ -7382,9 +7355,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5394
 \fBhgext/*\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5395
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5396
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5397
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5398
-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
  5399
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5400
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5401
+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
  5402
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5403
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5404
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5405
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5406
@@ -7391,9 +7364,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5407
 Changesets committed in May 2008, sorted by user:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5408
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5409
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5410
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5411
-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
  5412
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5413
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5414
+hg log \-r "sort(date('May 2008'), user)"
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
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5418
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5419
@@ -7401,11 +7374,11 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5420
 release:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5421
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5422
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5423
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5424
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5425
 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
  5426
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5427
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5428
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5429
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5430
+.RE
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5431
 .SH USING MERCURIAL FROM SCRIPTS AND AUTOMATION
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5432
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5433
 It is common for machines (as opposed to humans) to consume Mercurial.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5434
@@ -7415,7 +7388,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5435
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5436
 Machines have a choice of several methods to interface with Mercurial.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5437
 These include:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5438
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5439
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5440
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5441
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5442
 Executing the \fBhg\fP process
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5443
@@ -7425,21 +7398,21 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5444
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5445
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5446
 Calling out to a command server
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5447
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5448
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5449
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5450
 Executing \fBhg\fP processes is very similar to how humans interact with
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5451
 Mercurial in the shell. It should already be familiar to you.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5452
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5453
-\%\fBhg serve\fP\: can be used to start a server. By default, this will start
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5454
+\fBhg serve\fP can be used to start a server. By default, this will start
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5455
 a "hgweb" HTTP server. This HTTP server has support for machine\-readable
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5456
-output, such as JSON. For more, see \%\fBhg help hgweb\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5457
+output, such as JSON. For more, see \fBhg help hgweb\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5458
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5459
-\%\fBhg serve\fP\: can also start a "command server." Clients can connect
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5460
+\fBhg serve\fP can also start a "command server." Clients can connect
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5461
 to this server and issue Mercurial commands over a special protocol.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5462
 For more details on the command server, including links to client
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5463
-libraries, see \%https://mercurial.selenic.com/wiki/CommandServer\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5464
+libraries, see https://mercurial.selenic.com/wiki/CommandServer.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5465
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5466
-\%\fBhg serve\fP\: based interfaces (the hgweb and command servers) have the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5467
+\fBhg serve\fP based interfaces (the hgweb and command servers) have the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5468
 advantage over simple \fBhg\fP process invocations in that they are
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5469
 likely more efficient. This is because there is significant overhead
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5470
 to spawn new Python processes.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5471
@@ -7451,14 +7424,14 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5472
 .RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5473
 .SS Environment Variables
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5474
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5475
-As documented in \%\fBhg help environment\fP\:, various environment variables
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5476
+As documented in \fBhg help environment\fP, various environment variables
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5477
 influence the operation of Mercurial. The following are particularly
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5478
 relevant for machines consuming Mercurial:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5479
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5480
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5481
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5482
 .B HGPLAIN
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5483
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5484
-If not set, Mercurial\(aqs output could be influenced by configuration
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5485
+If not set, Mercurial's output could be influenced by configuration
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5486
 settings that impact its encoding, verbose mode, localization, etc.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5487
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5488
 It is highly recommended for machines to set this variable when
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5489
@@ -7479,7 +7452,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5490
 .B HGRCPATH
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5491
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5492
 If not set, Mercurial will inherit config options from config files
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5493
-using the process described in \%\fBhg help config\fP\:. This includes
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5494
+using the process described in \fBhg help config\fP. This includes
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5495
 inheriting user or system\-wide config files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5496
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5497
 When utmost control over the Mercurial configuration is desired, the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5498
@@ -7490,7 +7463,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5499
 consequences, as the user and system config files often define things
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5500
 like the username and extensions that may be required to interface
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5501
 with a repository.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5502
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5503
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5504
 .SS Consuming Command Output
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5505
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5506
 It is common for machines to need to parse the output of Mercurial
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5507
@@ -7514,7 +7487,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5508
 .SS Using Templates to Control Output
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5509
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5510
 Many \fBhg\fP commands support templatized output via the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5511
-\fB\-T/\-\-template\fP argument. For more, see \%\fBhg help templates\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5512
+\fB\-T/\-\-template\fP argument. For more, see \fBhg help templates\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5513
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5514
 Templates are useful for explicitly controlling output so that
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5515
 you get exactly the data you want formatted how you want it. For
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5516
@@ -7552,13 +7525,13 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5517
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5518
 Commands often have varying output verbosity, even when machine
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5519
 readable styles are being used (e.g. \fB\-T json\fP). Adding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5520
-\fB\-v/\-\-verbose\fP and \fB\-\-debug\fP to the command\(aqs arguments can
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5521
+\fB\-v/\-\-verbose\fP and \fB\-\-debug\fP to the command's arguments can
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5522
 increase the amount of data exposed by Mercurial.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5523
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5524
 An alternate way to get the data you need is by explicitly specifying
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5525
 a template.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5526
 .SS Other Topics
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5527
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5528
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5529
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5530
 .B revsets
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5531
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5532
@@ -7566,7 +7539,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5533
 of revisions. Think of it as SQL for Mercurial repositories. Revsets
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5534
 are useful for querying repositories for specific data.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5535
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5536
-See \%\fBhg help revsets\fP\: for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5537
+See \fBhg help revsets\fP for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5538
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5539
 .B share extension
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5540
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5541
@@ -7580,8 +7553,8 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5542
 network. This is especially true for continuous integration (CI)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5543
 environments.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5544
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5545
-See \%\fBhg help \-e share\fP\: for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5546
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5547
+See \fBhg help \-e share\fP for more.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5548
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5549
 .SH SUBREPOSITORIES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5550
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5551
 Subrepositories let you nest external repositories or projects into a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5552
@@ -7592,7 +7565,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5553
 subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5554
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5555
 Subrepositories are made of three components:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5556
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5557
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5558
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5559
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5560
 Nested repository checkouts. They can appear anywhere in the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5561
@@ -7605,18 +7578,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5562
 subrepositories are referenced like:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5563
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5564
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5565
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5566
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5567
 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
  5568
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5569
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5570
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5571
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5572
 Git and Subversion subrepos are also supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5573
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5574
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5575
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5576
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5577
 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
  5578
 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
  5579
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5580
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5581
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5582
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5583
 where \fBpath/to/nested\fP is the checkout location relatively to the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5584
@@ -7639,7 +7612,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5585
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5586
 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
  5587
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5588
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5589
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5590
 .SS Adding a Subrepository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5591
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5592
 If \fB.hgsub\fP does not exist, create it and add it to the parent
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5593
@@ -7647,7 +7620,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5594
 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
  5595
 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
  5596
 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
  5597
-\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
  5598
+\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
  5599
 .SS Synchronizing a Subrepository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5600
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5601
 Subrepos do not automatically track the latest changeset of their
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5602
@@ -7664,7 +7637,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5603
 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
  5604
 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
  5605
 .SS Interaction with Mercurial Commands
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5606
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5607
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5608
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5609
 .B add
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5610
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5611
@@ -7699,7 +7672,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5612
 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
  5613
 to instead commit all modified subrepositories by specifying
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5614
 \-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
  5615
-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
  5616
+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
  5617
 longer any modified subrepositories, it records their state and
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5618
 finally commits it in the parent repository.  The \-\-addremove
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5619
 option also honors the \-S/\-\-subrepos option.  However, Git and
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5620
@@ -7739,7 +7712,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5621
 .B pull
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5622
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5623
 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
  5624
-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
  5625
+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
  5626
 subrepositories changes referenced by the parent repository pulled
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5627
 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
  5628
 case.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5629
@@ -7774,7 +7747,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5630
 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
  5631
 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
  5632
 can require network access when using subrepositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5633
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5634
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5635
 .SS Remapping Subrepositories Sources
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5636
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5637
 A subrepository source location may change during a project life,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5638
@@ -7792,12 +7765,12 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5639
 outgoing, incoming, tip, parents, and heads.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5640
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5641
 Some built\-in styles are packaged with Mercurial. These can be listed
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5642
-with \%\fBhg log \-\-template list\fP\:. Example usage:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5643
+with \fBhg log \-\-template list\fP. Example usage:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5644
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5645
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5646
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5647
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5648
 $ hg log \-r1.0::1.1 \-\-template changelog
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5649
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5650
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5651
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5652
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5653
 A template is a piece of text, with markup to invoke variable
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5654
@@ -7804,16 +7777,16 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5655
 expansion:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5656
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5657
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5658
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5659
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5660
 $ hg log \-r1 \-\-template "{node}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5661
 b56ce7b07c52de7d5fd79fb89701ea538af65746
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5662
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5663
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5664
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5665
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5666
 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
  5667
 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
  5668
 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
  5669
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5670
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5671
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5672
 .B activebookmark
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5673
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5674
@@ -7831,7 +7804,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5675
 .B bookmarks
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5676
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5677
 List of strings. Any bookmarks associated with the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5678
-changeset. Also sets \(aqactive\(aq, the name of the active bookmark.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5679
+changeset. Also sets 'active', the name of the active bookmark.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5680
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5681
 .B branch
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5682
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5683
@@ -7861,7 +7834,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5684
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5685
 .B extras
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5686
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5687
-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
  5688
+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
  5689
 field of this changeset.
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5690
 .TP
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5691
 .B file_adds
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5692
@@ -7917,24 +7890,24 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5693
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5694
 .B p1node
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5695
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5696
-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
  5697
+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
  5698
 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
  5699
 digits are 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5700
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5701
 .B p1rev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5702
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5703
-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
  5704
+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
  5705
 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
  5706
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5707
 .B p2node
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5708
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5709
-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
  5710
+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
  5711
 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
  5712
 parent, all digits are 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5713
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5714
 .B p2rev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5715
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5716
-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
  5717
+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
  5718
 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
  5719
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5720
 .B parents
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5721
@@ -7962,24 +7935,24 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5722
 .B tags
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5723
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5724
 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
  5725
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5726
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5727
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5728
 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
  5729
 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
  5730
 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
  5731
-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
  5732
+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
  5733
 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
  5734
 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
  5735
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5736
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5737
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5738
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5739
 $ hg tip \-\-template "{date|isodate}\en"
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5740
 2008\-08\-21 18:22 +0000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5741
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5742
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5743
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5744
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5745
 List of filters:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5746
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5747
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5748
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5749
 .B addbreaks
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5750
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5751
@@ -8062,7 +8035,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5752
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5753
 .B nonempty
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5754
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5755
-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
  5756
+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
  5757
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5758
 .B obfuscate
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  5759
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5760
@@ -8138,17 +8111,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5761
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5762
 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
  5763
 address.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5764
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5765
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5766
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5767
 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
  5768
 \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
  5769
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5770
 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
  5771
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5772
+.RS 0
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5773
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5774
 .B date(date[, fmt])
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5775
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5776
-Format a date. See \%\fBhg help dates\fP\: for formatting
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5777
+Format a date. See \fBhg help dates\fP for formatting
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5778
 strings. The default is a Unix date format, including the timezone:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5779
 "Mon Sep 04 15:13:13 2006 0700".
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5780
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5781
@@ -8210,7 +8183,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5782
 Converts a date to the specified timezone.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5783
 The default is local date.
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5784
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5785
-.B pad(text, width[, fillchar=\(aq \(aq[, right=False]])
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5786
+.B pad(text, width[, fillchar=' '[, right=False]])
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5787
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5788
 Pad text with a
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5789
 fill character.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5790
@@ -8218,7 +8191,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5791
 .B revset(query[, formatargs...])
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5792
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5793
 Execute a revision set query. See
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5794
-\%\fBhg help revset\fP\:.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5795
+\fBhg help revset\fP.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5796
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5797
 .B rstdoc(text, style)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5798
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5799
@@ -8247,29 +8220,29 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5800
 .B word(number, text[, separator])
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5801
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  5802
 Return the nth word from a string.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5803
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5804
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5805
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5806
 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
  5807
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5808
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5809
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5810
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5811
 expr % "{template}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5812
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5813
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5814
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5815
 As seen in the above example, "{template}" is interpreted as a template.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5816
 To prevent it from being interpreted, you can use an escape character "{"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5817
-or a raw string prefix, "r\(aq...\(aq".
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5818
+or a raw string prefix, "r'...'".
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5819
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5820
 Some sample command line templates:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5821
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5822
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5823
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5824
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5825
 Format lists, e.g. files:
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
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5828
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5829
-$ 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
  5830
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5831
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5832
+$ 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
  5833
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5834
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5835
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5836
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5837
@@ -8276,9 +8249,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5838
 Join the list of files with a ", ":
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5839
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5840
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5841
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5842
-$ 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
  5843
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5844
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5845
+$ 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
  5846
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5847
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5848
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5849
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5850
@@ -8285,9 +8258,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5851
 Modify each line of a commit description:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5852
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5853
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5854
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5855
-$ hg log \-\-template "{splitlines(desc) % \(aq**** {line}\en\(aq}"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5856
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5857
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5858
+$ hg log \-\-template "{splitlines(desc) % '**** {line}\en'}"
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5859
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5860
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5861
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  5862
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5863
@@ -8294,9 +8267,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5864
 Format date:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5865
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5866
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5867
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5868
-$ 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
  5869
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5870
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5871
+$ 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
  5872
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5873
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5874
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5875
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5876
@@ -8303,9 +8276,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5877
 Display date in UTC:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5878
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5879
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5880
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5881
-$ hg log \-r 0 \-\-template "{localdate(date, \(aqUTC\(aq)|date}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5882
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5883
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5884
+$ hg log \-r 0 \-\-template "{localdate(date, 'UTC')|date}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5885
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5886
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5887
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5888
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5889
@@ -8312,9 +8285,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5890
 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
  5891
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5892
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5893
-.ft C
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5894
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5895
 $ hg log \-r 0 \-\-template "{fill(desc, 30)}"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5896
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5897
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5898
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5899
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5900
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5901
@@ -8321,10 +8294,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5902
 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
  5903
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5904
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5905
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5906
-$ 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
  5907
-\(aqon branch {branch}\(aq)}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5908
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5909
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5910
+$ 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
  5911
+\&'on branch {branch}')}\en"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5912
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5913
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5914
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5915
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5916
@@ -8331,9 +8304,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5917
 Append a newline if not empty:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5918
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5919
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5920
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5921
-$ 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
  5922
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5923
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5924
+$ hg tip \-\-template "{if(author, '{author}\en')}"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5925
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5926
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5927
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5928
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5929
@@ -8340,9 +8313,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5930
 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
  5931
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5932
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5933
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5934
-$ 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
  5935
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5936
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5937
+$ 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
  5938
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5939
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5940
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5941
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5942
@@ -8349,27 +8322,27 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5943
 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
  5944
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5945
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5946
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5947
-$ 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
  5948
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5949
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5950
+$ 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
  5951
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  5952
 .fi
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5953
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5954
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5955
-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
  5956
+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
  5957
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5958
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5959
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5960
-$ 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
  5961
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5962
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5963
+$ 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
  5964
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5965
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5966
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5967
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5968
-Mark the active bookmark with \(aq*\(aq:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5969
+Mark the active bookmark with '*':
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5970
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5971
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5972
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5973
-$ hg log \-\-template "{bookmarks % \(aq{bookmark}{ifeq(bookmark, active, \(aq*\(aq)} \(aq}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5974
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5975
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5976
+$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, active, '*')} '}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5977
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5978
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5979
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5980
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5981
@@ -8376,18 +8349,18 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5982
 Find the previous release candidate tag, the distance and changes since the tag:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5983
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5984
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5985
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5986
-$ hg log \-r . \-\-template "{latesttag(\(aqre:^.*\-rc$\(aq) % \(aq{tag}, {changes}, {distance}\(aq}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5987
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5988
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  5989
+$ hg log \-r . \-\-template "{latesttag('re:^.*\-rc$') % '{tag}, {changes}, {distance}'}\en"
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5990
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5991
 .fi
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5992
 .IP \(bu 2
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5993
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5994
-Mark the working copy parent with \(aq@\(aq:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5995
+Mark the working copy parent with '@':
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5996
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5997
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5998
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  5999
-$ 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
  6000
-.ft P
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6001
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6002
+$ hg log \-\-template "{ifcontains(rev, revset('.'), '@')}\en"
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6003
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6004
 .fi
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6005
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6006
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6007
@@ -8394,9 +8367,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6008
 Show details of parent revisions:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6009
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6010
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6011
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6012
-$ hg log \-\-template "{revset(\(aqparents(%d)\(aq, rev) % \(aq{desc|firstline}\en\(aq}"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6013
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6014
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6015
+$ hg log \-\-template "{revset('parents(%d)', rev) % '{desc|firstline}\en'}"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6016
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6017
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6018
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6019
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6020
@@ -8403,9 +8376,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6021
 Show only commit descriptions that start with "template":
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6022
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6023
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6024
-.ft C
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6025
-$ hg log \-\-template "{startswith(\(aqtemplate\(aq, firstline(desc))}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6026
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6027
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6028
+$ hg log \-\-template "{startswith('template', firstline(desc))}\en"
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6029
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6030
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6031
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6032
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6033
@@ -8412,34 +8385,34 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6034
 Print the first word of each line of a commit message:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6035
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6036
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6037
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6038
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6039
 $ hg log \-\-template "{word(0, desc)}\en"
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6040
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6041
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6042
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6043
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6044
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6045
 .SH URL PATHS
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6046
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6047
 Valid URLs are of the form:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6048
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6049
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6050
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6051
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6052
 local/filesystem/path[#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6053
 file://local/filesystem/path[#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6054
 http://[user[:pass]@]host[:port]/[path][#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6055
 https://[user[:pass]@]host[:port]/[path][#revision]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6056
 ssh://[user@]host[:port]/[path][#revision]
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
 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
  6062
-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
  6063
-\%\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
  6064
+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
  6065
+\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
  6066
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6067
 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
  6068
-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
  6069
-revisions\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6070
+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
  6071
+revisions\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6072
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6073
-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
  6074
+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
  6075
 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
  6076
 server.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6077
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6078
@@ -8447,7 +8420,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6079
 web.cacerts.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6080
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6081
 Some notes about using SSH with Mercurial:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6082
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6083
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6084
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6085
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6086
 SSH requires an accessible shell account on the destination machine
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6087
@@ -8454,63 +8427,63 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6088
 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
  6089
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6090
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6091
-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
  6092
+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
  6093
 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
  6094
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6095
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6096
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6097
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6098
 ssh://example.com//tmp/repository
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6099
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6100
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6101
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6102
 .IP \(bu 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6103
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6104
-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
  6105
+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
  6106
 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
  6107
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6108
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6109
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6110
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6111
 Host *.mylocalnetwork.example.com
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6112
   Compression no
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6113
 Host *
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6114
   Compression yes
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6115
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6116
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6117
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6118
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6119
 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
  6120
 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
  6121
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6122
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6123
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6124
 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
  6125
 aliases under the [paths] section like so:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6126
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6127
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6128
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6129
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6130
 [paths]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6131
 alias1 = URL1
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6132
 alias2 = URL2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6133
 \&...
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6134
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6135
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6136
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6137
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6138
 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
  6139
-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
  6140
+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
  6141
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6142
 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
  6143
 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
  6144
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6145
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6146
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6147
 .B default:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6148
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6149
 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
  6150
-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
  6151
-\(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
  6152
+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
  6153
+\&'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
  6154
 pull\-like commands (including incoming and outgoing).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6155
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6156
 .B default\-push:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6157
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6158
-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
  6159
-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
  6160
-.UNINDENT
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6161
+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
  6162
+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
  6163
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6164
 .SH EXTENSIONS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6165
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6166
 This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6167
@@ -8534,7 +8507,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6168
 distinguish them.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6169
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6170
 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
  6171
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6172
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6173
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6174
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6175
 Deny  list for branches (section \fBacl.deny.branches\fP)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6176
@@ -8547,7 +8520,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6177
 .IP 4. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6178
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6179
 Allow list for paths    (section \fBacl.allow\fP)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6180
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6181
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6182
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6183
 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
  6184
 .SS Branch\-based Access Control
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6185
@@ -8555,7 +8528,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6186
 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
  6187
 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
  6188
 either:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6189
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6190
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6191
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6192
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6193
 a branch name, or
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6194
@@ -8562,10 +8535,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6195
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6196
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6197
 an asterisk, to match any branch;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6198
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6199
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6200
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6201
 The corresponding values can be either:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6202
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6203
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6204
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6205
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6206
 a comma\-separated list containing users and groups, or
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6207
@@ -8572,7 +8545,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6208
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6209
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6210
 an asterisk, to match anyone;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6211
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6212
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6213
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6214
 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
  6215
 of the match.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6216
@@ -8594,7 +8567,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6217
 .SS Example Configuration
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6218
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6219
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6220
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6221
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6222
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6223
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6224
 # Use this if you want to check access restrictions at commit time
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6225
@@ -8670,12 +8643,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6226
 src/main/resources/** = *
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6227
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6228
 \&.hgtags = release_engineer
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6229
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6230
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6231
 .fi
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6232
 .SS Examples using the "!" prefix
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6233
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6234
-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
  6235
-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
  6236
+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
  6237
+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
  6238
 be created.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6239
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6240
 The "!" prefix allows you to prevent anyone except a given user or group to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6241
@@ -8687,18 +8660,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6242
 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
  6243
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6244
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6245
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6246
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6247
 [acl.allow.branches]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6248
 # Empty
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6249
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6250
 [acl.deny.branches]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6251
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6252
-# 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
  6253
-# \(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
  6254
+# 1) only 'gollum' can commit to branch 'ring';
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6255
+# '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
  6256
 ring = !gollum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6257
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6258
-# 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
  6259
-# \(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
  6260
+# 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
  6261
+# '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
  6262
 lake = !@hobbit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6263
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6264
 # You can also deny access based on file paths:
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6265
@@ -8707,10 +8680,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6266
 # Empty
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6267
 
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6268
 [acl.deny]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6269
-# 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
  6270
-# \(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
  6271
+# 3) only 'gollum' can change the file below;
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6272
+# '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
  6273
 /misty/mountains/cave/ring = !gollum
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6274
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6275
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6276
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6277
 .SS blackbox
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6278
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6279
@@ -8721,7 +8694,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6280
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6281
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6282
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6283
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6284
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6285
 [blackbox]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6286
 track = *
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6287
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6288
@@ -8736,7 +8709,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6289
 maxsize = 1.5 MB
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6290
 # 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
  6291
 maxfiles = 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6292
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6293
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6294
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6295
 .SS Commands
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6296
 .SS blackbox
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6297
@@ -8744,20 +8717,20 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6298
 view the recent repository events:
1637
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
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6301
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6302
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6303
 hg blackbox [OPTION]...
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6304
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6305
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6306
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6307
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6308
 view the recent repository events
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6309
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6310
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6311
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6312
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6313
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6314
 .BI \-l,  \-\-limit \ <VALUE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6315
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6316
 the number of events to show (default: 10)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6317
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6318
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6319
 .SS bugzilla
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6320
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6321
 hooks for integrating with the Bugzilla bug tracker
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6322
@@ -8770,7 +8743,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6323
 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
  6324
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6325
 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
  6326
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6327
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6328
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6329
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6330
 Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6331
@@ -8782,7 +8755,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6332
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6333
 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
  6334
 using MySQL are supported. Requires Python MySQLdb.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6335
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6336
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6337
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6338
 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
  6339
 relies on a Bugzilla contrib script to send out bug change
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6340
@@ -8810,12 +8783,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6341
 works on all supported Bugzilla versions.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6342
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6343
 Configuration items common to all access modes:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6344
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6345
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6346
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6347
 .B bugzilla.version
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6348
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6349
 The access type to use. Values recognized are:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6350
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6351
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6352
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6353
 .B \fBxmlrpc\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6354
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6355
@@ -8838,7 +8811,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6356
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6357
 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
  6358
 including 2.18.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6359
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6360
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6361
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6362
 .B bugzilla.regexp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6363
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6364
@@ -8883,7 +8856,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6365
 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
  6366
 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
  6367
 extension specifies:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6368
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6369
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6370
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6371
 .B \fB{bug}\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6372
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6373
@@ -8900,7 +8873,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6374
 .B \fB{hgweb}\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6375
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6376
 Base URL for browsing Mercurial repositories.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6377
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6378
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6379
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6380
 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
  6381
 {bug}.\endetails:\en\et{desc|tabindent}\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6382
@@ -8917,10 +8890,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6383
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6384
 Base URL for browsing Mercurial repositories. Referenced from
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6385
 templates as \fB{hgweb}\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6386
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6387
+.RE
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
 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
  6390
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6391
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6392
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6393
 .B bugzilla.usermap
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6394
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6395
@@ -8929,13 +8902,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6396
 line:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6397
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6398
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6399
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6400
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6401
 committer = Bugzilla user
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6402
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6403
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6404
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6405
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6406
 See also the \fB[usermap]\fP section.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6407
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6408
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6409
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6410
 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
  6411
 committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6412
@@ -8942,7 +8915,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6413
 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
  6414
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6415
 XMLRPC access mode configuration:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6416
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6417
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6418
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6419
 .B bugzilla.bzurl
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6420
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6421
@@ -8957,22 +8930,22 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6422
 .B bugzilla.password
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6423
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6424
 The password for Bugzilla login.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6425
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6426
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6427
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6428
 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
  6429
 and also:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6430
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6431
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6432
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6433
 .B bugzilla.bzemail
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6434
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6435
 The Bugzilla email address.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6436
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6437
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6438
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6439
 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
  6440
 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
  6441
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6442
 MySQL access mode configuration:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6443
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6444
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6445
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6446
 .B bugzilla.host
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6447
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6448
@@ -9012,12 +8985,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6449
 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
  6450
 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
  6451
 contrib/sendbugmail.pl %(id)s %(user)s".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6452
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6453
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6454
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6455
 Activating the extension:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6456
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6457
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6458
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6459
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6460
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6461
 bugzilla =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6462
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6463
@@ -9024,7 +8997,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6464
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6465
 # 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
  6466
 incoming.bugzilla = python:hgext.bugzilla.hook
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6467
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6468
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6469
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6470
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6471
 Example configurations:
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6472
@@ -9036,7 +9009,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6473
 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
  6474
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6475
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6476
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6477
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6478
 [bugzilla]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6479
 bzurl=http://my\-project.org/bugzilla
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6480
 user=bugmail@my\-project.org
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6481
@@ -9049,7 +9022,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6482
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6483
 [web]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6484
 baseurl=http://my\-project.org/hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6485
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6486
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6487
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6488
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6489
 XMLRPC+email example configuration. This uses the Bugzilla at
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6490
@@ -9061,7 +9034,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6491
 \fBbugzilla@my\-project.org\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6492
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6493
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6494
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6495
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6496
 [bugzilla]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6497
 bzurl=http://my\-project.org/bugzilla
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6498
 user=bugmail@my\-project.org
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6499
@@ -9078,7 +9051,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6500
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6501
 [usermap]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6502
 [email protected][email protected]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6503
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6504
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6505
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6506
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6507
 MySQL example configuration. This has a local Bugzilla 3.2 installation
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6508
@@ -9089,7 +9062,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6509
 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
  6510
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6511
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6512
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6513
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6514
 [bugzilla]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6515
 host=localhost
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6516
 password=XYZZY
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6517
@@ -9106,18 +9079,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6518
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6519
 [usermap]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6520
 [email protected][email protected]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6521
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6522
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6523
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6524
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6525
 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
  6526
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6527
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6528
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6529
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6530
 Changeset 3b16791d6642 in repository\-name.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6531
 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
  6532
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6533
 Changeset commit comment. Bug 1234.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6534
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6535
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6536
 .fi
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6537
 .SS censor
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6538
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6539
@@ -9131,14 +9104,14 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6540
 Typical uses for censor are due to security or legal requirements, including:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6541
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6542
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6543
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6544
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6545
 * Passwords, private keys, cryptographic material
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6546
 * Licensed data/code/libraries for which the license has expired
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6547
 * Personally Identifiable Information or other private data
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6548
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6549
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6550
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6551
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6552
-Censored nodes can interrupt mercurial\(aqs typical operation whenever the excised
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6553
+Censored nodes can interrupt mercurial's typical operation whenever the excised
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6554
 data needs to be materialized. Some commands, like \fBhg cat\fP/\fBhg revert\fP,
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6555
 simply fail when asked to produce censored data. Others, like \fBhg verify\fP and
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6556
 \fBhg update\fP, must be capable of tolerating censored data to continue to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6557
@@ -9148,13 +9121,13 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6558
 .SS censor
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6559
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6560
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6561
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6562
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6563
 hg censor \-r REV [\-t TEXT] [FILE]
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6564
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6565
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6566
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6567
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6568
 Options:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6569
-.INDENT 0.0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6570
+.RS 0
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6571
 .TP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6572
 .BI \-r,  \-\-rev \ <REV>
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6573
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6574
@@ -9163,42 +9136,42 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6575
 .BI \-t,  \-\-tombstone \ <TEXT>
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6576
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6577
 replacement tombstone data
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6578
-.UNINDENT
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  6579
+.RE
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6580
 .SS chgserver
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6581
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6582
 command server extension for cHg (EXPERIMENTAL)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6583
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6584
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6585
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6586
-.B \(aqS\(aq channel (read/write)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6587
+.B \&'S' channel (read/write)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6588
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6589
 propagate ui.system() request to client
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6590
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6591
-.B \(aqattachio\(aq command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6592
+.B \&'attachio' command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6593
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6594
-attach client\(aqs stdio passed by sendmsg()
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6595
+attach client's stdio passed by sendmsg()
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6596
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6597
-.B \(aqchdir\(aq command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6598
+.B \&'chdir' command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6599
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6600
 change current directory
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6601
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6602
-.B \(aqgetpager\(aq command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6603
+.B \&'getpager' command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6604
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6605
 checks if pager is enabled and which pager should be executed
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6606
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6607
-.B \(aqsetenv\(aq command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6608
+.B \&'setenv' command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6609
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6610
 replace os.environ completely
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6611
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6612
-.B \(aqSIGHUP\(aq signal
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6613
+.B \&'SIGHUP' signal
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6614
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6615
 reload configuration files
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6616
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6617
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6618
 .SS children
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6619
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6620
 command to display child changesets (DEPRECATED)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6621
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6622
-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
  6623
-"children(REV)"\fP\: instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6624
+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
  6625
+"children(REV)"\fP instead.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6626
 .SS Commands
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6627
 .SS children
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6628
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6629
@@ -9205,30 +9178,30 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6630
 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
  6631
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6632
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6633
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6634
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6635
 hg children [\-r REV] [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6636
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6637
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6638
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6639
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6640
-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
  6641
+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
  6642
 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
  6643
 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
  6644
 file was last changed (after the working directory revision or the
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6645
 argument to \-\-rev if given) is printed.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6646
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6647
-Please use \%\fBhg log\fP\: instead:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6648
+Please use \fBhg log\fP instead:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6649
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6650
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6651
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6652
-hg children => hg log \-r \(aqchildren()\(aq
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6653
-hg children \-r REV => hg log \-r \(aqchildren(REV)\(aq
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6654
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6655
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6656
+hg children => hg log \-r 'children()'
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6657
+hg children \-r REV => hg log \-r 'children(REV)'
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6658
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6659
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6660
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6661
-See \%\fBhg help log\fP\: and \%\fBhg help revsets.children\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6662
+See \fBhg help log\fP and \fBhg help revsets.children\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6663
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6664
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6665
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6666
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6667
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6668
 .BI \-r,  \-\-rev \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6669
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6670
@@ -9241,7 +9214,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6671
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6672
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6673
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6674
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6675
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6676
 .SS churn
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6677
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6678
 command to display statistics about repository history
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6679
@@ -9251,9 +9224,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6680
 histogram of changes to the repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6681
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6682
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6683
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6684
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6685
 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
  6686
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6687
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6688
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6689
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6690
 This command will display a histogram representing the number
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6691
@@ -9269,7 +9242,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6692
 Examples:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6693
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6694
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6695
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6696
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6697
 # 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
  6698
 hg churn \-t "{author|email}"
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6699
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6700
@@ -9281,7 +9254,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6701
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6702
 # 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
  6703
 hg churn \-f "%Y" \-s
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6704
-.ft P
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6705
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6706
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6707
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6708
 It is possible to map alternate email addresses to a main address
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6709
@@ -9288,9 +9261,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6710
 by providing a file using the following format:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6711
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6712
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6713
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6714
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6715
 <alias email> = <actual email>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6716
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6717
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6718
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6719
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6720
 Such a file may be specified with the \-\-aliases option, otherwise
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6721
@@ -9298,7 +9271,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6722
 Aliases will be split from the rightmost "=".
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6723
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6724
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6725
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6726
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6727
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6728
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6729
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6730
@@ -9343,7 +9316,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6731
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6732
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6733
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6734
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  6735
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6736
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  6737
 [+] marked option can be specified multiple times
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6738
 .SS clonebundles
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6739
@@ -9356,7 +9329,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6740
 resources on the server.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6741
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6742
 Cloning can be a CPU and I/O intensive operation on servers. Traditionally,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6743
-the server, in response to a client\(aqs request to clone, dynamically generates
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6744
+the server, in response to a client's request to clone, dynamically generates
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6745
 a bundle containing the entire repository content and sends it to the client.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6746
 There is no caching on the server and the server will have to redundantly
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6747
 generate the same outgoing bundle in response to each clone request. For
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6748
@@ -9364,8 +9337,8 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6749
 clones can make scaling the server challenging and costly.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6750
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6751
 This extension provides server operators the ability to offload potentially
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6752
-expensive clone load to an external service. Here\(aqs how it works.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6753
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6754
+expensive clone load to an external service. Here's how it works.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6755
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6756
 .IP 1. 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6757
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6758
 A server operator establishes a mechanism for making bundle files available
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6759
@@ -9392,10 +9365,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6760
 .IP 7. 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6761
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6762
 The client reconnects to the original server and performs the equivalent
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6763
-of \%\fBhg pull\fP\: to retrieve all repository data not in the bundle. (The
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6764
+of \fBhg pull\fP to retrieve all repository data not in the bundle. (The
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6765
 repository could have been updated between when the bundle was created
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6766
 and when the client started the clone.)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6767
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6768
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6769
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6770
 Instead of the server generating full repository bundles for every clone
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6771
 request, it generates full bundles once and they are subsequently reused to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6772
@@ -9405,7 +9378,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6773
 clones to less than 1% of original.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6774
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6775
 To work, this extension requires the following of server operators:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6776
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6777
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6778
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6779
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6780
 Generating bundle files of repository content (typically periodically,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6781
@@ -9419,23 +9392,23 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6782
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6783
 A process for keeping the bundles manifest in sync with available bundle
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6784
 files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6785
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6786
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6787
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6788
-Strictly speaking, using a static file hosting server isn\(aqt required: a server
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6789
+Strictly speaking, using a static file hosting server isn't required: a server
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6790
 operator could use a dynamic service for retrieving bundle data. However,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6791
 static file hosting services are simple and scalable and should be sufficient
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6792
 for most needs.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6793
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6794
-Bundle files can be generated with the \%\fBhg bundle\fP\: command. Typically
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6795
-\%\fBhg bundle \-\-all\fP\: is used to produce a bundle of the entire repository.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6796
+Bundle files can be generated with the \fBhg bundle\fP command. Typically
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6797
+\fBhg bundle \-\-all\fP is used to produce a bundle of the entire repository.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6798
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6799
-\%\fBhg debugcreatestreamclonebundle\fP\: can be used to produce a special
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6800
+\fBhg debugcreatestreamclonebundle\fP can be used to produce a special
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6801
 \fIstreaming clone bundle\fP. These are bundle files that are extremely efficient
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6802
 to produce and consume (read: fast). However, they are larger than
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6803
 traditional bundle formats and require that clients support the exact set
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6804
 of repository data store formats in use by the repository that created them.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6805
 Typically, a newer server can serve data that is compatible with older clients.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6806
-However, \fIstreaming clone bundles\fP don\(aqt have this guarantee. \fBServer
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6807
+However, \fIstreaming clone bundles\fP don't have this guarantee. \fBServer
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6808
 operators need to be aware that newer versions of Mercurial may produce
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6809
 streaming clone bundles incompatible with older Mercurial versions.\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6810
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6811
@@ -9448,12 +9421,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6812
 ) delimited list of entries.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6813
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6814
 Each line in this file defines an available bundle. Lines have the format:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6815
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6816
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6817
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6818
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6819
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6820
 <URL> [<key>=<value>[ <key>=<value>]]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6821
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6822
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6823
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6824
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6825
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6826
 That is, a URL followed by an optional, space\-delimited list of key=value
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6827
 pairs describing additional properties of this bundle. Both keys and values
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6828
@@ -9466,7 +9439,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6829
 data center closest to them.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6830
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6831
 The following reserved keys are currently defined:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6832
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6833
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6834
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6835
 .B BUNDLESPEC
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6836
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6837
@@ -9473,21 +9446,21 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6838
 A "bundle specification" string that describes the type of the bundle.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6839
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6840
 These are string values that are accepted by the "\-\-type" argument of
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6841
-\%\fBhg bundle\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6842
+\fBhg bundle\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6843
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6844
 The values are parsed in strict mode, which means they must be of the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6845
 "<compression>\-<type>" form. See
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6846
 mercurial.exchange.parsebundlespec() for more details.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6847
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6848
-\%\fBhg debugbundle \-\-spec\fP\: can be used to print the bundle specification
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6849
+\fBhg debugbundle \-\-spec\fP can be used to print the bundle specification
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6850
 string for a bundle file. The output of this command can be used verbatim
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6851
 for the value of \fBBUNDLESPEC\fP (it is already escaped).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6852
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6853
 Clients will automatically filter out specifications that are unknown or
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6854
-unsupported so they won\(aqt attempt to download something that likely won\(aqt
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6855
+unsupported so they won't attempt to download something that likely won't
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6856
 apply.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6857
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6858
-The actual value doesn\(aqt impact client behavior beyond filtering:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6859
+The actual value doesn't impact client behavior beyond filtering:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6860
 clients will still sniff the bundle type from the header of downloaded
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6861
 files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6862
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6863
@@ -9509,10 +9482,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6864
 with the clonebundles facility.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6865
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6866
 Value should be "true".
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6867
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6868
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6869
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6870
 Manifests can contain multiple entries. Assuming metadata is defined, clients
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6871
-will filter entries from the manifest that they don\(aqt support. The remaining
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6872
+will filter entries from the manifest that they don't support. The remaining
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6873
 entries are optionally sorted by client preferences
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6874
 (\fBexperimental.clonebundleprefers\fP config option). The client then attempts
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6875
 to fetch the bundle at the first URL in the remaining list.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6876
@@ -9522,7 +9495,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6877
 for this is that if a server is using clone bundles, it is probably doing so
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6878
 because the feature is necessary to help it scale. In other words, there
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6879
 is an assumption that clone load will be offloaded to another service and
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6880
-that the Mercurial server isn\(aqt responsible for serving this clone load.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6881
+that the Mercurial server isn't responsible for serving this clone load.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6882
 If that other service experiences issues and clients start mass falling back to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6883
 the original Mercurial server, the added clone load could overwhelm the server
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6884
 due to unexpected load and effectively take it offline. Not having clients
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6885
@@ -9555,10 +9528,10 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6886
 available, then effects are rendered with the ECMA\-48 SGR control
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6887
 function (aka ANSI escape codes).
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6888
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6889
-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
  6890
-\(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
  6891
-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
  6892
-\(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
  6893
+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
  6894
+\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6895
+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
  6896
+\&'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
  6897
 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
  6898
 silently ignored.
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6899
 .SS Labels
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6900
@@ -9565,8 +9538,8 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6901
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6902
 Text receives color effects depending on the labels that it has. Many
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6903
 default Mercurial commands emit labelled text. You can also define
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6904
-your own labels in templates using the label function, see \%\fBhg help
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6905
-templates\fP\:. A single portion of text may have more than one label. In
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6906
+your own labels in templates using the label function, see \fBhg help
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6907
+templates\fP. A single portion of text may have more than one label. In
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6908
 that case, effects given to the last label will override any other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6909
 effects. This includes the special "none" effect, which nullifies
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6910
 other effects.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6911
@@ -9574,18 +9547,18 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6912
 Labels are normally invisible. In order to see these labels and their
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6913
 position in the text, use the global \-\-color=debug option. The same
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6914
 anchor text may be associated to multiple labels, e.g.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6915
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6916
-.INDENT 3.5
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6917
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6918
+.RS 3
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6919
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6920
 [log.changeset changeset.secret|changeset:   22611:6f0a53c8f587]
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6921
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6922
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6923
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6924
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6925
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6926
 The following are the default effects for some default labels. Default
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6927
 effects may be overridden from your configuration file:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6928
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6929
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6930
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6931
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6932
 [color]
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6933
 status.modified = blue bold underline red_background
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6934
 status.added = green bold
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6935
@@ -9594,7 +9567,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6936
 status.unknown = magenta bold underline
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6937
 status.ignored = black bold
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6938
 
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6939
-# \(aqnone\(aq turns off all effects
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6940
+# 'none' turns off all effects
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6941
 status.clean = none
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6942
 status.copied = none
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6943
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6944
@@ -9639,7 +9612,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6945
 shelve.name = blue bold
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6946
 
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6947
 histedit.remaining = red bold
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6948
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6949
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6950
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6951
 .SS Custom colors
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6952
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6953
@@ -9648,18 +9621,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6954
 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
  6955
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6956
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6957
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6958
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6959
 color.brightblue = 12
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6960
 color.pink = 207
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6961
 color.orange = 202
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6962
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6963
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6964
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6965
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6966
-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
  6967
-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
  6968
-\(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
  6969
+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
  6970
+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
  6971
+\&'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
  6972
 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
  6973
-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
  6974
+including appending '_background' to set the background to that color.
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6975
 .SS Modes
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6976
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6977
 By default, the color extension will use ANSI mode (or win32 mode on
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  6978
@@ -9667,19 +9640,19 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6979
 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
  6980
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6981
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6982
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6983
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  6984
 [color]
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6985
 mode = terminfo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6986
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6987
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6988
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6989
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  6990
-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
  6991
+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
  6992
 disable color.
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6993
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6994
 Note that on some systems, terminfo mode may cause problems when using
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6995
 color with the pager extension and less \-R. less with the \-R option
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6996
 will only display ECMA\-48 color codes, and terminfo mode may sometimes
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6997
-emit codes that less doesn\(aqt understand. You can work around this by
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6998
+emit codes that less doesn't understand. You can work around this by
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  6999
 either using ansi mode (or auto mode), or by using less \-r (which will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7000
 pass through all terminal control codes, not just color control
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7001
 codes).
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7002
@@ -9690,11 +9663,11 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7003
 the pager is active:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7004
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7005
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7006
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7007
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7008
 [color]
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7009
 mode = auto
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7010
 pagermode = ansi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7011
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7012
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7013
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7014
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7015
 If \fBpagermode\fP is not defined, the \fBmode\fP will be used.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7016
@@ -9708,13 +9681,13 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7017
 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
  7018
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7019
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7020
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7021
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7022
 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7023
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7024
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7025
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7026
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7027
 Accepted source formats [identifiers]:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7028
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7029
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7030
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7031
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7032
 Mercurial [hg]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7033
@@ -9742,10 +9715,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7034
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7035
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7036
 Perforce [p4]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7037
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7038
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7039
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7040
 Accepted destination formats [identifiers]:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7041
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7042
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7043
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7044
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7045
 Mercurial [hg]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7046
@@ -9752,7 +9725,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7047
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7048
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7049
 Subversion [svn] (history on branches is not preserved)
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7050
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7051
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7052
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7053
 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
  7054
 Otherwise, convert will only import up to the named revision
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7055
@@ -9760,12 +9733,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7056
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7057
 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
  7058
 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
  7059
-repository doesn\(aqt exist, it will be created.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7060
+repository doesn't exist, it will be created.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7061
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7062
 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
  7063
 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
  7064
 order. Sort modes have the following effects:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7065
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7066
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7067
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7068
 .B \-\-branchsort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7069
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7070
@@ -9790,21 +9763,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7071
 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
  7072
 to parent branches, only supported by Mercurial
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7073
 sources.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7074
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7075
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7076
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7077
-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
  7078
+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
  7079
 (\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
  7080
 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
  7081
 for that revision, like so:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7082
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7083
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7084
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7085
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7086
 <source ID> <destination ID>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7087
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7088
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7089
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7090
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7091
-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
  7092
-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
  7093
+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
  7094
+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
  7095
 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
  7096
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7097
 The authormap is a simple text file that maps each source commit
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7098
@@ -9813,9 +9786,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7099
 author mapping and the line format is:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7100
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7101
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7102
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7103
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7104
 source author = destination author
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7105
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7106
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7107
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7108
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7109
 Empty lines and lines starting with a \fB#\fP are ignored.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7110
@@ -9825,13 +9798,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7111
 directives:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7112
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7113
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7114
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7115
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7116
 include path/to/file\-or\-dir
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7117
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7118
 exclude path/to/file\-or\-dir
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7119
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7120
 rename path/to/source path/to/destination
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
 Comment lines start with \fB#\fP. A specified path matches if it
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7126
@@ -9864,9 +9837,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7127
 comma\-separated values:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7128
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7129
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7130
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7131
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7132
 key parent1, parent2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7133
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7134
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7135
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7136
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7137
 The key is the revision ID in the source
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7138
@@ -9886,9 +9859,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7139
 lines of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7140
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7141
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7142
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7143
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7144
 original_branch_name new_branch_name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7145
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7146
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7147
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7148
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7149
 where "original_branch_name" is the name of the branch in the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7150
@@ -9900,7 +9873,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7151
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7152
 The Mercurial source recognizes the following configuration
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7153
 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
  7154
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7155
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7156
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7157
 .B convert.hg.ignoreerrors
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7158
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7159
@@ -9922,7 +9895,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7160
 .B convert.hg.revs
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7161
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7162
 revset specifying the source revisions to convert.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7163
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7164
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7165
 .SS CVS Source
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7166
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7167
 CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7168
@@ -9936,7 +9909,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7169
 sandbox is ignored.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7170
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7171
 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
  7172
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7173
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7174
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7175
 .B convert.cvsps.cache
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7176
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7177
@@ -9987,7 +9960,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7178
 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
  7179
 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
  7180
 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
  7181
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7182
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7183
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7184
 An additional "debugcvsps" Mercurial command allows the builtin
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7185
 changeset merging code to be run without doing a conversion. Its
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7186
@@ -10007,7 +9980,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7187
 detection.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7188
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7189
 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
  7190
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7191
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7192
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7193
 .B convert.svn.branches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7194
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7195
@@ -10029,28 +10002,28 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7196
 use local time (as determined by the TZ
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7197
 environment variable) for changeset date/times. The default
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7198
 is False (use UTC).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7199
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7200
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7201
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7202
 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
  7203
 instead of being integrally converted. Only single branch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7204
 conversions are supported.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7205
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7206
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7207
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7208
 .B convert.svn.startrev
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7209
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7210
 specify start Subversion revision number.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7211
 The default is 0.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7212
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7213
+.RE
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7214
 .SS Git Source
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7215
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7216
 The Git importer converts commits from all reachable branches (refs
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7217
 in refs/heads) and remotes (refs in refs/remotes) to Mercurial.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7218
 Branches are converted to bookmarks with the same name, with the
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7219
-leading \(aqrefs/heads\(aq stripped. Git submodules are converted to Git
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7220
+leading 'refs/heads' stripped. Git submodules are converted to Git
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7221
 subrepos in Mercurial.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7222
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7223
 The following options can be set with \fB\-\-config\fP:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7224
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7225
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7226
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7227
 .B convert.git.similarity
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7228
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7229
@@ -10058,7 +10031,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7230
 commit must be to be imported as renames or copies, as a
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7231
 percentage between \fB0\fP (disabled) and \fB100\fP (files must be
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7232
 identical). For example, \fB90\fP means that a delete/add pair will
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7233
-be imported as a rename if more than 90% of the file hasn\(aqt
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7234
+be imported as a rename if more than 90% of the file hasn't
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7235
 changed. The default is \fB50\fP.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7236
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7237
 .B convert.git.findcopiesharder
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7238
@@ -10072,13 +10045,13 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7239
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7240
 remote refs are converted as bookmarks with
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7241
 \fBconvert.git.remoteprefix\fP as a prefix followed by a /. The default
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7242
-is \(aqremote\(aq.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7243
+is 'remote'.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7244
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7245
 .B convert.git.skipsubmodules
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7246
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7247
 does not convert root level .gitmodules files
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7248
 or files with 160000 mode indicating a submodule. Default is False.
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7249
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7250
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7251
 .SS Perforce Source
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7252
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7253
 The Perforce (P4) importer can be given a p4 depot path or a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7254
@@ -10089,7 +10062,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7255
 target may be named \fB...\-hg\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7256
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7257
 The following options can be set with \fB\-\-config\fP:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7258
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7259
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7260
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7261
 .B convert.p4.encoding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7262
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7263
@@ -10101,7 +10074,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7264
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7265
 specify initial Perforce revision (a
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7266
 Perforce changelist number).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7267
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7268
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7269
 .SS Mercurial Destination
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7270
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7271
 The Mercurial destination will recognize Mercurial subrepositories in the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7272
@@ -10113,7 +10086,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7273
 An example showing how to convert a repository with subrepositories:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7274
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7275
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7276
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7277
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7278
 # so convert knows the type when it sees a non empty destination
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7279
 $ hg init converted
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7280
 
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7281
@@ -10120,11 +10093,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7282
 $ hg convert orig/sub1 converted/sub1
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7283
 $ hg convert orig/sub2 converted/sub2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7284
 $ hg convert orig converted
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7285
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7286
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7287
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7288
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7289
 The following options are supported:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7290
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7291
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7292
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7293
 .B convert.hg.clonebranches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7294
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7295
@@ -10143,22 +10116,22 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7296
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7297
 .B convert.hg.sourcename
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7298
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7299
-records the given string as a \(aqconvert_source\(aq extra
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7300
+records the given string as a 'convert_source' extra
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7301
 value on each commit made in the target repository. The default is None.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7302
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7303
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7304
 .SS All Destinations
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7305
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7306
 All destination types accept the following options:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7307
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7308
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7309
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7310
 .B convert.skiptags
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7311
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7312
 does not convert tags from the source repo to the target
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7313
 repo. The default is False.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7314
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7315
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7316
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7317
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7318
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7319
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7320
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7321
 .BI \-\-authors \ <FILE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7322
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7323
@@ -10211,7 +10184,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7324
 .B \-\-closesort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7325
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7326
 try to reorder closed revisions
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7327
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7328
+.RE
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7329
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7330
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7331
 .SS eol
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7332
@@ -10225,7 +10198,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7333
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7334
 The extension reads its configuration from a versioned \fB.hgeol\fP
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7335
 configuration file found in the root of the working directory. The
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7336
-\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
  7337
+\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
  7338
 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
  7339
 \fB[repository]\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7340
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7341
@@ -10238,9 +10211,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7342
 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
  7343
 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
  7344
 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
  7345
-\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
  7346
+\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
  7347
 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
  7348
-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
  7349
+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7350
 default behavior; it is only needed if you need to override a later,
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7351
 more general pattern.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7352
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7353
@@ -10257,7 +10230,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7354
 Example versioned \fB.hgeol\fP file:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7355
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7356
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7357
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7358
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7359
 [patterns]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7360
 **.py = native
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7361
 **.vcproj = CRLF
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7362
@@ -10267,7 +10240,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7363
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7364
 [repository]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7365
 native = LF
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7366
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7367
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7368
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7369
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7370
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7371
@@ -10279,12 +10252,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7372
 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
  7373
 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
  7374
 overall behavior. There are three settings:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7375
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7376
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7377
 .IP \(bu 2
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7378
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7379
 \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
  7380
 \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
  7381
-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
  7382
+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
  7383
 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
  7384
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7385
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7386
@@ -10298,7 +10271,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7387
 \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
  7388
 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
  7389
 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
  7390
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7391
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7392
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7393
 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
  7394
 like the deprecated win32text extension does. This means that you can
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7395
@@ -10314,7 +10287,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7396
 \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
  7397
 \fBpretxnchangegroup\fP hooks.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7398
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7399
-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
  7400
+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
  7401
 used.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7402
 .SS extdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7403
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7404
@@ -10327,12 +10300,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7405
 files to compare.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7406
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7407
 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
  7408
-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
  7409
+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
  7410
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7411
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7412
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7413
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7414
 [extdiff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7415
-# 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
  7416
+# 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
  7417
 cdiff = gdiff \-Nprc5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7418
 ## or the old way:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7419
 #cmd.cdiff = gdiff
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7420
@@ -10348,20 +10321,20 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7421
 # 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
  7422
 # your .vimrc
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7423
 vimdiff = gvim \-f "+next" \e
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7424
-          "+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
  7425
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7426
+          "+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
  7427
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7428
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7429
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7430
 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
  7431
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7432
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7433
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7434
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7435
 $parent1, $plabel1 \- filename, descriptive label of first parent
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7436
 $child,   $clabel  \- filename, descriptive label of child revision
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7437
 $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
  7438
 $root              \- repository root
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7439
 $parent is an alias for $parent1.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7440
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7441
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7442
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7443
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7444
 The extdiff extension will look in your [diff\-tools] and [merge\-tools]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7445
@@ -10368,17 +10341,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7446
 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
  7447
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7448
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7449
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7450
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7451
 [extdiff]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7452
 kdiff3 =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7453
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7454
 [diff\-tools]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7455
-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
  7456
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7457
+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7458
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7459
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7460
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7461
 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
  7462
-\%\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
  7463
+\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
  7464
 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
  7465
 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
  7466
 .SS Commands
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7467
@@ -10387,9 +10360,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7468
 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
  7469
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7470
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7471
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7472
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7473
 hg extdiff [OPT]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7474
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7475
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7476
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7477
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7478
 Show differences between revisions for the specified files, using
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7479
@@ -10408,7 +10381,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7480
 to its parent.
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
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7486
 .BI \-p,  \-\-program \ <CMD>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7487
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7488
@@ -10441,7 +10414,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7489
 .B \-S,  \-\-subrepos
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7490
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7491
 recurse into subrepositories
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7492
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7493
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7494
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7495
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7496
 .SS factotum
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7497
@@ -10457,9 +10430,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7498
 By default, keys are specified as:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7499
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7500
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7501
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7502
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7503
 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
  7504
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7505
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7506
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7507
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7508
 If the factotum extension is unable to read the required key, one will be
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7509
@@ -10469,12 +10442,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7510
 default, these entries are:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7511
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7512
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7513
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7514
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7515
 [factotum]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7516
 executable = /bin/auth/factotum
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7517
 mountpoint = /mnt/factotum
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7518
 service = hg
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7519
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7520
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7521
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7522
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7523
 The executable entry defines the full path to the factotum binary. The
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7524
@@ -10489,9 +10462,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7525
 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
  7526
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7527
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7528
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7529
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7530
 hg fetch [SOURCE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7531
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7532
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7533
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7534
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7535
 This finds all changes from the repository at the specified path
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7536
@@ -10506,12 +10479,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7537
 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
  7538
 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
  7539
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7540
-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
  7541
+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
  7542
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7543
 Returns 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7544
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7545
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7546
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7547
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7548
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7549
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7550
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7551
@@ -10556,7 +10529,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7552
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7553
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7554
 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
  7555
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7556
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7557
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7558
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7559
 .SS gpg
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7560
@@ -10568,9 +10541,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7561
 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
  7562
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7563
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7564
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7565
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7566
 hg sigcheck REV
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7567
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7568
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7569
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7570
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7571
 verify all the signatures there may be for a particular revision
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7572
@@ -10579,9 +10552,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7573
 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
  7574
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7575
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7576
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7577
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7578
 hg sign [OPTION]... [REV]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7579
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7580
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7581
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7582
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7583
 If no revision is given, the parent of the working directory is used,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7584
@@ -10590,10 +10563,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7585
 The \fBgpg.cmd\fP config setting can be used to specify the command
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7586
 to run. A default key can be specified with \fBgpg.key\fP.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7587
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7588
-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
  7589
+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
  7590
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7591
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7592
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7593
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7594
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7595
 .B \-l,  \-\-local
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7596
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7597
@@ -10626,15 +10599,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7598
 .BI \-u,  \-\-user \ <USER>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7599
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7600
 record the specified user as committer
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
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7603
 .SS sigs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7604
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7605
 list signed changesets:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7606
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7607
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7608
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7609
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7610
 hg sigs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7611
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7612
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7613
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7614
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7615
 list signed changesets
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7616
@@ -10643,7 +10616,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7617
 command to view revision graphs from a shell (DEPRECATED)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7618
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7619
 The functionality of this extension has been include in core Mercurial
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7620
-since version 2.3. Please use \%\fBhg log \-G ...\fP\: instead.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7621
+since version 2.3. Please use \fBhg log \-G ...\fP instead.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7622
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7623
 This extension adds a \-\-graph option to the incoming, outgoing and log
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7624
 commands. When this options is given, an ASCII representation of the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7625
@@ -10654,9 +10627,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7626
 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
  7627
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7628
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7629
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7630
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7631
 hg glog [OPTION]... [FILE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7632
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7633
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7634
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7635
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7636
 Print a revision history alongside a revision graph drawn with
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7637
@@ -10665,10 +10638,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7638
 Nodes printed as an @ character are parents of the working
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7639
 directory.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7640
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7641
-This is an alias to \%\fBhg log \-G\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7642
+This is an alias to \fBhg log \-G\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7643
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7644
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7645
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7646
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7647
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7648
 .B \-f,  \-\-follow
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7649
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7650
@@ -10757,7 +10730,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7651
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7652
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7653
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7654
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7655
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7656
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7657
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7658
 .SS hgcia
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7659
@@ -10768,7 +10741,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7660
 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
  7661
 .sp
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
 [cia]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7666
 # your registered CIA user name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7667
 user = foo
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7668
@@ -10800,7 +10773,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7669
 [web]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7670
 # If you want hyperlinks (optional)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7671
 baseurl = http://server/path/to/repo
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7672
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7673
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7674
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7675
 .SS hgk
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7676
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7677
@@ -10812,19 +10785,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7678
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7679
 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
  7680
 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
  7681
-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
  7682
-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
  7683
-repository, and needs to be enabled.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7684
+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
  7685
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7686
-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
  7687
-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
  7688
-the path to hgk in your configuration file:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  7689
+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
  7690
+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
  7691
+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
  7692
+file:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7693
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7694
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7695
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7696
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7697
 [hgk]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7698
 path = /location/of/hgk
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7699
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7700
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7701
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7702
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7703
 hgk can make use of the extdiff extension to visualize revisions.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7704
@@ -10831,10 +10803,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7705
 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
  7706
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7707
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7708
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7709
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7710
 [hgk]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7711
 vdiff=vdiff
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
 Revisions context menu will now display additional entries to fire
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7717
@@ -10845,36 +10817,36 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7718
 start interactive history viewer:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7719
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7720
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7721
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7722
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7723
 hg view [\-l LIMIT] [REVRANGE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7724
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7725
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7726
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7727
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7728
 start interactive history viewer
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7729
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7730
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7731
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7732
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7733
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7734
 .BI \-l,  \-\-limit \ <NUM>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7735
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7736
 limit number of changes displayed
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7737
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7738
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7739
 .SS highlight
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7740
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7741
 syntax highlighting for hgweb (requires Pygments)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7742
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7743
 It depends on the Pygments syntax highlighting library:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7744
-\%http://pygments.org/\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7745
+http://pygments.org/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7746
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7747
 There are the following configuration options:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7748
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7749
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7750
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7751
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  7752
 [web]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7753
 pygments_style = <style> (default: colorful)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7754
-highlightfiles = <fileset> (default: size(\(aq<5M\(aq))
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7755
+highlightfiles = <fileset> (default: size('<5M'))
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7756
 highlightonlymatchfilename = <bool> (default False)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7757
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7758
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7759
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7760
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7761
 \fBhighlightonlymatchfilename\fP will only highlight files if their type could
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7762
@@ -10889,7 +10861,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7763
 is as follows, assuming the following history:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7764
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7765
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7766
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7767
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7768
 @  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
  7769
 |    Add delta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7770
 |
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7771
@@ -10901,7 +10873,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7772
 |
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7773
 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
  7774
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7775
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7776
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7777
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7778
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7779
 If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7780
@@ -10908,7 +10880,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7781
 file open in your editor:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7782
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7783
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7784
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7785
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7786
 pick c561b4e977df Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7787
 pick 030b686bedc4 Add gamma
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7788
 pick 7c2fd3b9020c Add delta
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7789
@@ -10921,11 +10893,11 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7790
 #  p, pick = use commit
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7791
 #  e, edit = use commit, but stop for amending
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7792
 #  f, fold = use commit, but combine it with the one above
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7793
-#  r, roll = like fold, but discard this commit\(aqs description
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7794
+#  r, roll = like fold, but discard this commit's description
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7795
 #  d, drop = remove commit from history
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7796
 #  m, mess = edit commit message without changing commit content
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7797
 #
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7798
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7799
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7800
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7801
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7802
 In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7803
@@ -10934,7 +10906,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7804
 would reorganize the file to look like this:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7805
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7806
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7807
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7808
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7809
 pick 030b686bedc4 Add gamma
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7810
 pick c561b4e977df Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7811
 fold 7c2fd3b9020c Add delta
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7812
@@ -10947,11 +10919,11 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7813
 #  p, pick = use commit
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7814
 #  e, edit = use commit, but stop for amending
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7815
 #  f, fold = use commit, but combine it with the one above
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7816
-#  r, roll = like fold, but discard this commit\(aqs description
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  7817
+#  r, roll = like fold, but discard this commit's description
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7818
 #  d, drop = remove commit from history
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7819
 #  m, mess = edit commit message without changing commit content
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7820
 #
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7821
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7822
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7823
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7824
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7825
 At which point you close the editor and \fBhistedit\fP starts working. When you
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7826
@@ -10959,21 +10931,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7827
 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
  7828
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7829
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7830
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7831
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7832
 Add beta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7833
 ***
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7834
 Add delta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7835
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7836
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7837
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7838
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7839
 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
  7840
-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
  7841
+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
  7842
 \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
  7843
 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
  7844
 like this:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7845
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7846
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7847
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7848
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7849
 @  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
  7850
 |    Add beta and delta.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7851
 |
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7852
@@ -10982,12 +10954,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7853
 |
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7854
 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
  7855
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7856
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7857
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7858
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7859
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7860
 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
  7861
 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
  7862
-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
  7863
+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
  7864
 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
  7865
 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
  7866
 revisions by passing the \fB\-\-keep\fP flag.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7867
@@ -10994,20 +10966,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7868
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7869
 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
  7870
 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
  7871
-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
  7872
+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
  7873
 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
  7874
-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
  7875
+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
  7876
 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
  7877
 original message for the \fBedit\fP ed revision.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7878
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7879
 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
  7880
-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
  7881
+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
  7882
 \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
  7883
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7884
 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
  7885
-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
  7886
-\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
  7887
-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
  7888
+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
  7889
+\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
  7890
+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
  7891
 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
  7892
 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
  7893
 have made and return to the state before you attempted to edit your
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7894
@@ -11017,7 +10989,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7895
 changes, such that we have the following history:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7896
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7897
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7898
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7899
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7900
 @  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
  7901
 |    Add theta
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7902
 |
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7903
@@ -11038,7 +11010,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
 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
  7906
      Add alpha
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7907
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7908
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7909
 .fi
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
 If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7912
@@ -11052,10 +11024,10 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7913
 configuration file:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7914
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7915
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7916
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7917
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7918
 [histedit]
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7919
 linelen = 120      # truncate rule lines at 120 characters
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7920
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7921
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7922
 .fi
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7923
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7924
 \fBhg histedit\fP attempts to automatically choose an appropriate base
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7925
@@ -11063,10 +11035,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7926
 revset in your configuration file:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7927
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7928
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7929
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7930
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7931
 [histedit]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7932
 defaultrev = only(.) & draft()
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7933
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7934
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7935
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7936
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7937
 By default each edited revision needs to be present in histedit commands.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7938
@@ -11074,10 +11046,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7939
 the drop to be implicit for missing commits by adding:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7940
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7941
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7942
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7943
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7944
 [histedit]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7945
 dropmissing = True
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7946
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7947
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7948
 .fi
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7949
 .SS Commands
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  7950
 .SS histedit
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7951
@@ -11085,15 +11057,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  7952
 interactively edit changeset history:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7953
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7954
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7955
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  7956
+.ft
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7957
 hg histedit [OPTIONS] ([ANCESTOR] | \-\-outgoing [URL])
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7958
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7959
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7960
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7961
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7962
 This command lets you edit a linear series of changesets (up to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7963
 and including the working directory, which should be clean).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7964
 You can:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7965
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7966
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7967
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7968
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7969
 \fIpick\fP to [re]order a changeset
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7970
@@ -11108,14 +11080,14 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7971
 \fIfold\fP to combine it with the preceding changeset
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7972
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7973
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7974
-\fIroll\fP like fold, but discarding this commit\(aqs description
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7975
+\fIroll\fP like fold, but discarding this commit's description
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7976
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7977
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7978
 \fIedit\fP to edit this changeset
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7979
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7980
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7981
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7982
 There are a number of ways to select the root changeset:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7983
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7984
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7985
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7986
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7987
 Specify ANCESTOR directly
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7988
@@ -11122,7 +11094,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7989
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7990
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7991
 Use \-\-outgoing \-\- it will be the first linear changeset not
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7992
-included in destination. (See \%\fBhg help config.default\-push\fP\:)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7993
+included in destination. (See \fBhg help config.default\-push\fP)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7994
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7995
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7996
 Otherwise, the value from the "histedit.defaultrev" config option
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7997
@@ -11130,7 +11102,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7998
 specified. The first revision returned by the revset is used. By
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  7999
 default, this selects the editable history that is unique to the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8000
 ancestry of the working directory.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8001
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8002
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8003
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8004
 If you use \-\-outgoing, this command will abort if there are ambiguous
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8005
 outgoing revisions. For example, if there are multiple branches
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8006
@@ -11138,13 +11110,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8007
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8008
 Use "min(outgoing() and ::.)" or similar revset specification
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8009
 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
  8010
-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
  8011
+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
  8012
 selecting revisions.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8013
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8014
 Examples:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8015
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8016
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8017
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8018
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8019
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8020
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8021
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8022
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8023
 A number of changes have been made.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8024
@@ -11153,9 +11125,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8025
 Start history editing from revision 3:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8026
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8027
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8028
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8029
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8030
 hg histedit \-r 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8031
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8032
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8033
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8034
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8035
 An editor opens, containing the list of revisions,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8036
@@ -11162,11 +11134,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8037
 with specific actions specified:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8038
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8039
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8040
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8041
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8042
 pick 5339bf82f0ca 3 Zworgle the foobar
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8043
 pick 8ef592ce7cc4 4 Bedazzle the zerlog
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8044
 pick 0a9639fcda9d 5 Morgify the cromulancy
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8045
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8046
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8047
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8048
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8049
 Additional information about the possible actions
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8050
@@ -11174,14 +11146,14 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8051
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8052
 To remove revision 3 from the history,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8053
 its action (at the beginning of the relevant line)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8054
-is changed to \(aqdrop\(aq:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8055
+is changed to 'drop':
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8056
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8057
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8058
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8059
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8060
 drop 5339bf82f0ca 3 Zworgle the foobar
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8061
 pick 8ef592ce7cc4 4 Bedazzle the zerlog
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8062
 pick 0a9639fcda9d 5 Morgify the cromulancy
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8063
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8064
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8065
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8066
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8067
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8068
@@ -11191,9 +11163,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8069
 Start history editing from revision 2:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8070
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8071
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8072
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8073
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8074
 hg histedit \-r 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8075
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8076
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8077
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8078
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8079
 An editor opens, containing the list of revisions,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8080
@@ -11200,11 +11172,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8081
 with specific actions specified:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8082
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8083
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8084
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8085
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8086
 pick 252a1af424ad 2 Blorb a morgwazzle
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8087
 pick 5339bf82f0ca 3 Zworgle the foobar
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8088
 pick 8ef592ce7cc4 4 Bedazzle the zerlog
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8089
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8090
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8091
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8092
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8093
 To swap revision 2 and 4, its lines are swapped
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8094
@@ -11211,15 +11183,15 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8095
 in the editor:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8096
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8097
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8098
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8099
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8100
 pick 8ef592ce7cc4 4 Bedazzle the zerlog
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8101
 pick 5339bf82f0ca 3 Zworgle the foobar
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8102
 pick 252a1af424ad 2 Blorb a morgwazzle
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8103
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8104
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8105
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8106
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8107
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8108
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8109
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8110
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8111
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8112
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8113
 Returns 0 on success, 1 if user intervention is required (not only
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8114
 for intentional "edit" command, but also for resolving unexpected
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8115
@@ -11226,7 +11198,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8116
 conflicts).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8117
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8118
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8119
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8120
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8121
 .TP
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  8122
 .BI \-\-commands \ <FILE>
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  8123
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8124
@@ -11242,7 +11214,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8125
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8126
 .B \-k,  \-\-keep
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8127
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8128
-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
  8129
+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
  8130
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8131
 .B \-\-abort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8132
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8133
@@ -11259,7 +11231,7 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  8134
 .BI \-r,  \-\-rev \ <REV[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8135
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8136
 first revision to be edited
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8137
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8138
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8139
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8140
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8141
 .SS keyword
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8142
@@ -11282,7 +11254,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8143
 Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8144
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8145
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8146
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8147
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8148
 [keyword]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8149
 # 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
  8150
 **.py =
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8151
@@ -11291,7 +11263,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8152
 [keywordset]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8153
 # prefer svn\- over cvs\-like default keywordmaps
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8154
 svn = True
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8155
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8156
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8157
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8158
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8159
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8160
@@ -11300,11 +11272,11 @@
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  8161
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8162
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8163
 For [keywordmaps] template mapping and expansion demonstration and
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8164
-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
  8165
+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
  8166
 available templates and filters.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8167
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8168
 Three additional date template filters are provided:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8169
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8170
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8171
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8172
 .B \fButcdate\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8173
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8174
@@ -11317,20 +11289,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8175
 .B \fBsvnisodate\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8176
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8177
 "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
  8178
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8179
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8180
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8181
-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
  8182
+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
  8183
 replaced with customized keywords and templates. Again, run
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8184
-\%\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
  8185
+\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
  8186
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8187
-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
  8188
+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
  8189
 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
  8190
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8191
 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
  8192
-\%\fBhg kwexpand\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8193
+\fBhg kwexpand\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8194
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8195
 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
  8196
-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
  8197
+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
  8198
 {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
  8199
 .SS Commands
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8200
 .SS kwdemo
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8201
@@ -11338,9 +11310,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8202
 print [keywordmaps] configuration and an expansion example:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8203
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8204
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8205
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8206
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8207
 hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8208
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8209
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8210
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8211
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8212
 Show current, custom, or default keyword template maps and their
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8213
@@ -11351,10 +11323,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8214
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8215
 Use \-d/\-\-default to disable current configuration.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8216
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8217
-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
  8218
+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
  8219
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8220
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8221
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8222
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8223
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8224
 .B \-d,  \-\-default
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8225
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8226
@@ -11363,15 +11335,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8227
 .BI \-f,  \-\-rcfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8228
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8229
 read maps from rcfile
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8230
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8231
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8232
 .SS kwexpand
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8233
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8234
 expand keywords in the working directory:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8235
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8236
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8237
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8238
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8239
 hg kwexpand [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8240
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8241
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8242
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8243
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8244
 Run after (re)enabling keyword expansion.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8245
@@ -11379,7 +11351,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8246
 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
  8247
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8248
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8249
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8250
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8251
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8252
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8253
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8254
@@ -11388,7 +11360,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8255
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8256
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8257
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8258
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8259
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8260
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8261
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8262
 .SS kwfiles
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8263
@@ -11396,9 +11368,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8264
 show files configured for keyword expansion:
196
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
 hg kwfiles [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8270
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8271
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8272
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8273
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8274
 List which files in the working directory are matched by the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8275
@@ -11408,7 +11380,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8276
 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
  8277
 expansion.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8278
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8279
-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
  8280
+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
  8281
 inclusion and exclusion of files.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8282
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8283
 With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8284
@@ -11415,16 +11387,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8285
 of files are:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8286
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8287
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8288
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8289
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8290
 K = keyword expansion candidate
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8291
 k = keyword expansion candidate (not tracked)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8292
 I = ignored
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8293
 i = ignored (not tracked)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8294
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8295
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8296
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8297
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8298
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8299
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8300
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8301
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8302
 .B \-A,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8303
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8304
@@ -11445,7 +11417,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8305
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8306
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8307
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8308
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8309
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8310
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8311
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8312
 .SS kwshrink
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8313
@@ -11453,9 +11425,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8314
 revert expanded keywords in the working directory:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8315
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8316
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8317
-.ft C
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
 hg kwshrink [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8320
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8321
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8322
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8323
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8324
 Must be run before changing/disabling active keywords.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8325
@@ -11463,7 +11435,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8326
 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
  8327
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8328
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8329
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8330
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8331
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8332
 .BI \-I,  \-\-include \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8333
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8334
@@ -11472,7 +11444,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8335
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8336
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8337
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8338
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8339
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8340
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8341
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8342
 .SS largefiles
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8343
@@ -11481,10 +11453,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8344
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8345
 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
  8346
 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
  8347
-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
  8348
+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
  8349
 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
  8350
 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
  8351
-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
  8352
+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
  8353
 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
  8354
 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
  8355
 somewhere, and you only fetch the revisions that you need when you
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8356
@@ -11496,18 +11468,18 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8357
 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
  8358
 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
  8359
 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
  8360
-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
  8361
+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
  8362
 of large files when you clone or pull.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8363
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8364
 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
  8365
-\-\-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
  8366
+\-\-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
  8367
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8368
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8369
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8370
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8371
 $ dd if=/dev/urandom of=randomdata count=2000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8372
 $ hg add \-\-large randomdata
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8373
-$ 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
  8374
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8375
+$ hg commit \-m 'add randomdata as a largefile'
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8376
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8377
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8378
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8379
 When you push a changeset that adds/modifies largefiles to a remote
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8380
@@ -11524,8 +11496,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8381
 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
  8382
 largefiles).
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8383
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8384
-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
  8385
-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
  8386
+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
  8387
+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
  8388
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8389
 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
  8390
 download all the largefiles that correspond to the new changesets at
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8391
@@ -11544,12 +11516,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8392
 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
  8393
 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
  8394
 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
  8395
-\%\fBhg lfconvert\fP\: command:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8396
+\fBhg lfconvert\fP command:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8397
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8398
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8399
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8400
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8401
 $ hg lfconvert \-\-size 10 oldrepo newrepo
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8402
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8403
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8404
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8405
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8406
 In repositories that already have largefiles in them, any new file
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8407
@@ -11559,20 +11531,20 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8408
 \-\-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
  8409
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8410
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8411
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8412
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8413
 [largefiles]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8414
 minsize = 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8415
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8416
 $ hg add \-\-lfsize 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8417
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8418
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8419
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8420
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8421
 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
  8422
-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
  8423
+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
  8424
 tracked as largefiles:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8425
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8426
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8427
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8428
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8429
 [largefiles]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8430
 patterns =
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8431
   *.jpg
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8432
@@ -11579,7 +11551,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8433
   re:.*\e.(png|bmp)$
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8434
   library.zip
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8435
   content/audio/*
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8436
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8437
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8438
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8439
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8440
 Files that match one of these patterns will be added as largefiles
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8441
@@ -11588,7 +11560,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8442
 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
  8443
 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
  8444
 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
  8445
-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
  8446
+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
  8447
 command.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8448
 .SS Commands
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8449
 .SS lfconvert
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8450
@@ -11596,9 +11568,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8451
 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
  8452
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8453
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8454
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8455
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8456
 hg lfconvert SOURCE DEST [FILE ...]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8457
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8458
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8459
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8460
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8461
 Convert repository SOURCE to a new repository DEST, identical to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8462
@@ -11618,7 +11590,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8463
 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
  8464
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8465
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8466
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8467
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8468
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8469
 .BI \-s,  \-\-size \ <SIZE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8470
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8471
@@ -11627,33 +11599,33 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8472
 .B \-\-to\-normal
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8473
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8474
 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
  8475
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8476
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8477
 .SS lfpull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8478
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8479
 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
  8480
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8481
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8482
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8483
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8484
 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
  8485
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8486
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8487
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8488
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8489
 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
  8490
 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
  8491
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8492
-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
  8493
-See \%\fBhg help urls\fP\: for more information.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8494
+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
  8495
+See \fBhg help urls\fP for more information.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8496
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8497
 Some examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8498
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8499
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8500
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8501
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8502
 pull largefiles for all branch heads:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8503
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8504
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8505
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8506
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8507
 hg lfpull \-r "head() and not closed()"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8508
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8509
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8510
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8511
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8512
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8513
@@ -11660,14 +11632,14 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8514
 pull largefiles on the default branch:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8515
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8516
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8517
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8518
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8519
 hg lfpull \-r "branch(default)"
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8520
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8521
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8522
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8523
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8524
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8525
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8526
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8527
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8528
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8529
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8530
 .BI \-r,  \-\-rev \ <VALUE[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8531
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8532
@@ -11684,7 +11656,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8533
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8534
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8535
 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
  8536
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8537
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8538
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8539
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8540
 .SS mq
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8541
@@ -11698,10 +11670,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8542
 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
  8543
 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
  8544
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8545
-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
  8546
+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
  8547
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8548
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8549
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8550
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8551
 create new patch                          qnew
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8552
 import existing patch                     qimport
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8553
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8554
@@ -11711,7 +11683,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8555
 add known patch to applied stack          qpush
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8556
 remove patch from applied stack           qpop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8557
 refresh contents of top applied patch     qrefresh
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8558
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8559
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8560
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8561
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8562
 By default, mq will automatically use git patches when required to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8563
@@ -11719,29 +11691,29 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8564
 files creations or deletions. This behavior can be configured with:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8565
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8566
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8567
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8568
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8569
 [mq]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8570
 git = auto/keep/yes/no
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8571
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8572
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8573
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8574
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8575
-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
  8576
-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
  8577
-\(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
  8578
+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
  8579
+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
  8580
+\&'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
  8581
 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
  8582
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8583
 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
  8584
-\%\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
  8585
+\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
  8586
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8587
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8588
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8589
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8590
 [mq]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8591
 secret = True
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8592
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8593
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8594
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8595
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8596
 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
  8597
-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
  8598
+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
  8599
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8600
 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
  8601
 qgoto abort immediately. If \-f/\-\-force is used, the changes are
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8602
@@ -11748,10 +11720,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8603
 discarded. Setting:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8604
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8605
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8606
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8607
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8608
 [mq]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8609
 keepchanges = True
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8610
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8611
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8612
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8613
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8614
 make them behave as if \-\-keep\-changes were passed, and non\-conflicting
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8615
@@ -11766,15 +11738,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8616
 print the patches already applied:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8617
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8618
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8619
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8620
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8621
 hg qapplied [\-1] [\-s] [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8622
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8623
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8624
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8625
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8626
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8627
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8628
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8629
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8630
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8631
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8632
 .B \-1,  \-\-last
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8633
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8634
@@ -11783,15 +11755,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8635
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8636
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8637
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8638
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8639
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8640
 .SS qclone
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8641
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8642
 clone main and patch repository at same time:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8643
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8644
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8645
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8646
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8647
 hg qclone [OPTION]... SOURCE [DEST]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8648
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8649
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8650
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8651
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8652
 If source is local, destination will have no patches applied. If
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8653
@@ -11804,12 +11776,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8654
 default. Use \-p <url> to change.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8655
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8656
 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
  8657
-would be created by \%\fBhg init \-\-mq\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8658
+would be created by \fBhg init \-\-mq\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8659
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8660
 Return 0 on success.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8661
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8662
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8663
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8664
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8665
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8666
 .B \-\-pull
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8667
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8668
@@ -11838,21 +11810,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8669
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8670
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8671
 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
  8672
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8673
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8674
 .SS qcommit
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8675
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8676
 commit changes in the queue repository (DEPRECATED):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8677
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8678
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8679
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8680
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8681
 hg qcommit [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8682
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8683
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8684
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8685
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8686
-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
  8687
+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
  8688
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8689
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8690
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8691
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8692
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8693
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8694
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8695
@@ -11905,23 +11877,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8696
 .B \-S,  \-\-subrepos
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8697
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8698
 recurse into subrepositories
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8699
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8700
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8701
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8702
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8703
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8704
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8705
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8706
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8707
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8708
 aliases: qci
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8709
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8710
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8711
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8712
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8713
 .SS qdelete
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
 remove patches from queue:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8716
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8717
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8718
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8719
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8720
 hg qdelete [\-k] [PATCH]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8721
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8722
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8723
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8724
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8725
 The patches must not be applied, and at least one patch is required. Exact
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8726
@@ -11929,10 +11901,10 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8727
 preserved in the patch directory.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8728
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8729
 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
  8730
-use the \%\fBhg qfinish\fP\: command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8731
+use the \fBhg qfinish\fP command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8732
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8733
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8734
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8735
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8736
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8737
 .B \-k,  \-\-keep
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8738
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8739
@@ -11941,23 +11913,23 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8740
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8741
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8742
 stop managing a revision (DEPRECATED)
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8743
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8744
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8745
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8746
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8747
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8748
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8749
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8750
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8751
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8752
 aliases: qremove qrm
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8753
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8754
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8755
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8756
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8757
 .SS qdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8758
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8759
 diff of the current patch and subsequent modifications:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8760
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8761
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8762
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8763
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8764
 hg qdiff [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8765
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8766
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8767
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8768
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8769
 Shows a diff which includes the current patch as well as any
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8770
@@ -11965,8 +11937,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8771
 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
  8772
 after a qrefresh).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8773
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8774
-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
  8775
-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
  8776
+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
  8777
+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
  8778
 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
  8779
 qrefresh.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8780
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8781
@@ -11973,7 +11945,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8782
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8783
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8784
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8785
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8786
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8787
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8788
 .B \-a,  \-\-text
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8789
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8790
@@ -12030,7 +12002,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8791
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8792
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8793
 exclude names matching the given patterns
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8794
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8795
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8796
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8797
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8798
 .SS qfinish
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8799
@@ -12038,9 +12010,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8800
 move applied patches into repository history:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8801
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8802
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8803
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8804
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8805
 hg qfinish [\-a] [REV]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8806
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8807
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8808
 .fi
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
 Finishes the specified revisions (corresponding to applied
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8811
@@ -12059,20 +12031,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8812
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8813
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8814
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8815
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8816
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8817
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8818
 .B \-a,  \-\-applied
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8819
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8820
 finish all applied changesets
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8821
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8822
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8823
 .SS qfold
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8824
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8825
 fold the named patches into the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8826
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8827
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8828
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8829
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8830
 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
  8831
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8832
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8833
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8834
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8835
 Patches must not yet be applied. Each patch will be successively
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8836
@@ -12088,7 +12060,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8837
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8838
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8839
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8840
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8841
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8842
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8843
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8844
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8845
@@ -12105,21 +12077,21 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8846
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8847
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8848
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8849
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8850
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8851
 .SS qgoto
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8852
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8853
 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
  8854
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8855
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8856
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8857
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8858
 hg qgoto [OPTION]... PATCH
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8859
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8860
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8861
 .fi
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
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8864
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8865
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8866
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8867
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8868
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8869
 .B \-\-keep\-changes
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8870
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8871
@@ -12132,21 +12104,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8872
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8873
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8874
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8875
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8876
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8877
 .SS qguard
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8878
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8879
 set or print guards for a patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8880
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8881
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8882
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8883
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8884
 hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8885
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8886
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8887
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8888
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8889
 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
  8890
 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
  8891
-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
  8892
-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
  8893
+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
  8894
+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
  8895
 has activated it.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8896
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8897
 With no arguments, print the currently active guards.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8898
@@ -12153,21 +12125,21 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8899
 With arguments, set guards for the named patch.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8900
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8901
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8902
-Specifying negative guards now requires \(aq\-\-\(aq.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8903
+Specifying negative guards now requires '\-\-'.
99
c15c9099bb44 6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
  8904
 .RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8905
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8906
 To set guards on another patch:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8907
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8908
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8909
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8910
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8911
 hg qguard other.patch \-\- +2.6.17 \-stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8912
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8913
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8914
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8915
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8916
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8917
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8918
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8919
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8920
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8921
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8922
 .B \-l,  \-\-list
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8923
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8924
@@ -12176,15 +12148,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8925
 .B \-n,  \-\-none
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8926
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8927
 drop all guards
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8928
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8929
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8930
 .SS qheader
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8931
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8932
 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
  8933
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8934
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8935
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8936
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8937
 hg qheader [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8938
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8939
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8940
 .fi
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
 Returns 0 on success.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8943
@@ -12193,9 +12165,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8944
 import a patch or existing changeset:
196
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
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8947
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8948
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8949
 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
  8950
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8951
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8952
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8953
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8954
 The patch is inserted into the series after the last applied
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8955
@@ -12216,7 +12188,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8956
 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
  8957
 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
  8958
 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
  8959
-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
  8960
+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
  8961
 from mq control.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8962
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  8963
 To import a patch from standard input, pass \- as the patch file.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8964
@@ -12226,15 +12198,15 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8965
 To import an existing patch while renaming it:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8966
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8967
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8968
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8969
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8970
 hg qimport \-e existing\-patch \-n new\-name
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8971
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8972
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8973
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8974
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8975
 Returns 0 if import succeeded.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8976
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8977
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8978
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8979
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8980
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8981
 .B \-e,  \-\-existing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8982
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8983
@@ -12259,7 +12231,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8984
 .B \-P,  \-\-push
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8985
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8986
 qpush after importing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8987
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  8988
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8989
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8990
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8991
 .SS qinit
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  8992
@@ -12267,9 +12239,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  8993
 init a new queue repository (DEPRECATED):
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8994
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8995
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8996
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8997
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8998
 hg qinit [\-c]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  8999
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9000
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9001
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9002
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9003
 The queue repository is unversioned by default. If
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9004
@@ -12278,24 +12250,24 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9005
 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
  9006
 qcommit to commit changes to this queue repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9007
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9008
-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
  9009
-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
  9010
+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
  9011
+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
  9012
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9013
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9014
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9015
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9016
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9017
 .B \-c,  \-\-create\-repo
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9018
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9019
 create queue repository
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9020
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9021
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9022
 .SS qnew
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9023
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9024
 create a new patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9025
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9026
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9027
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9028
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9029
 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
  9030
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9031
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9032
 .fi
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
 qnew creates a new patch on top of the currently\-applied patch (if
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9035
@@ -12311,7 +12283,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9036
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9037
 \-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
  9038
 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
  9039
-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
  9040
+empty and the commit message is '[mq]: PATCH'.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9041
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9042
 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
  9043
 format. Read the diffs help topic for more information on why this
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9044
@@ -12321,7 +12293,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9045
 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
  9046
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9047
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9048
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9049
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9050
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9051
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9052
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9053
@@ -12366,7 +12338,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9054
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9055
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9056
 read commit message from file
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
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9059
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9060
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9061
 .SS qnext
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9062
@@ -12374,28 +12346,28 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9063
 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
  9064
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9065
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9066
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9067
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9068
 hg qnext [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9069
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9070
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9071
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9072
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9073
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9074
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9075
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9076
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9077
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9078
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9079
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9080
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9081
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9082
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9083
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9084
 .SS qpop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9085
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9086
 pop the current patch off the stack:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9087
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9088
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9089
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9090
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9091
 hg qpop [\-a] [\-f] [PATCH | INDEX]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9092
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9093
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9094
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9095
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9096
 Without argument, pops off the top of the patch stack. If given a
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9097
@@ -12410,7 +12382,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9098
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9099
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9100
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9101
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9102
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9103
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9104
 .B \-a,  \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9105
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9106
@@ -12431,34 +12403,34 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9107
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9108
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9109
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9110
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9111
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9112
 .SS qprev
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9113
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9114
 print the name of the preceding applied patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9115
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9116
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9117
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9118
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9119
 hg qprev [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9120
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9121
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9122
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9123
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9124
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9125
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9126
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9127
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9128
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9129
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9130
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9131
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9132
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9133
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9134
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9135
 .SS qpush
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9136
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9137
 push the next patch onto the stack:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9138
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9139
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9140
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9141
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9142
 hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9143
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9144
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9145
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9146
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9147
 By default, abort if the working directory contains uncommitted
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9148
@@ -12469,7 +12441,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9149
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9150
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9151
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9152
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9153
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9154
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9155
 .B \-\-keep\-changes
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9156
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9157
@@ -12506,15 +12478,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9158
 .B \-\-no\-backup
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9159
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9160
 do not save backup copies of files
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9161
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9162
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9163
 .SS qqueue
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9164
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9165
 manage multiple patch queues:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9166
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9167
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9168
-.ft C
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
 hg qqueue [OPTION] [QUEUE]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9171
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9172
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9173
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9174
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9175
 Supports switching between different patch queues, as well as creating
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9176
@@ -12536,7 +12508,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9177
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9178
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9179
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9180
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9181
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9182
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9183
 .B \-l,  \-\-list
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9184
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9185
@@ -12561,15 +12533,15 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9186
 .B \-\-purge
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9187
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9188
 delete queue, and remove patch dir
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9189
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9190
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9191
 .SS qrefresh
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9192
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9193
 update the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9194
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9195
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9196
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9197
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9198
 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
  9199
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9200
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9201
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9202
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9203
 If any file patterns are provided, the refreshed patch will
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9204
@@ -12591,7 +12563,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9205
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9206
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9207
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9208
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9209
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9210
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9211
 .B \-e,  \-\-edit
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9212
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9213
@@ -12636,7 +12608,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9214
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9215
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9216
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9217
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9218
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9219
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9220
 [+] marked option can be specified multiple times
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9221
 .SS qrename
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9222
@@ -12644,9 +12616,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9223
 rename a patch:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9224
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9225
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9226
-.ft C
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
 hg qrename PATCH1 [PATCH2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9229
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9230
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9231
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9232
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9233
 With one argument, renames the current patch to PATCH1.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9234
@@ -12653,26 +12625,26 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9235
 With two arguments, renames PATCH1 to PATCH2.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9236
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9237
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9238
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9239
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9240
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9241
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9242
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9243
 aliases: qmv
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9244
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9245
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9246
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9247
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9248
 .SS qrestore
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9249
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9250
 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
  9251
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9252
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9253
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9254
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9255
 hg qrestore [\-d] [\-u] REV
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9256
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9257
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9258
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9259
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9260
-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
  9261
+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
  9262
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9263
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9264
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9265
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9266
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9267
 .B \-d,  \-\-delete
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9268
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9269
@@ -12681,21 +12653,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9270
 .B \-u,  \-\-update
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9271
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9272
 update queue working directory
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9273
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9274
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9275
 .SS qsave
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9276
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9277
 save current queue state (DEPRECATED):
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9278
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9279
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9280
-.ft C
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
 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
  9283
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9284
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9285
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9286
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9287
-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
  9288
+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
  9289
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9290
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9291
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9292
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9293
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9294
 .B \-c,  \-\-copy
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9295
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9296
@@ -12720,18 +12692,18 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9297
 .BI \-l,  \-\-logfile \ <FILE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9298
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9299
 read commit message from file
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9300
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9301
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9302
 .SS qselect
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9303
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9304
 set or print guarded patches to push:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9305
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9306
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9307
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9308
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9309
 hg qselect [OPTION]... [GUARD]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9310
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9311
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9312
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9313
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9314
-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
  9315
+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
  9316
 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
  9317
 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
  9318
 selected guard, but will not be pushed if any negative guards
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9319
@@ -12738,11 +12710,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9320
 match the current guard. For example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9321
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9322
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9323
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9324
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9325
 qguard foo.patch \-\- \-stable    (negative guard)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9326
 qguard bar.patch    +stable    (positive guard)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9327
 qselect stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9328
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9329
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9330
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9331
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9332
 This activates the "stable" guard. mq will skip foo.patch (because
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9333
@@ -12768,7 +12740,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9334
 Returns 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9335
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9336
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9337
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9338
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9339
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9340
 .B \-n,  \-\-none
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9341
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9342
@@ -12785,21 +12757,21 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9343
 .B \-\-reapply
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9344
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9345
 pop, then reapply patches
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9346
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9347
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9348
 .SS qseries
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9349
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9350
 print the entire series file:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9351
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9352
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9353
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9354
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9355
 hg qseries [\-ms]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9356
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9357
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9358
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9359
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9360
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9361
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9362
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9363
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9364
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9365
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9366
 .B \-m,  \-\-missing
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9367
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9368
@@ -12808,40 +12780,40 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9369
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9370
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9371
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9372
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9373
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9374
 .SS qtop
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9375
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9376
 print the name of the current patch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9377
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9378
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9379
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9380
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9381
 hg qtop [\-s]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9382
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9383
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9384
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9385
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9386
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9387
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9388
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9389
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9390
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9391
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9392
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9393
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9394
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9395
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9396
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9397
 .SS qunapplied
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9398
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9399
 print the patches not yet applied:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9400
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9401
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9402
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9403
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9404
 hg qunapplied [\-1] [\-s] [PATCH]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9405
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9406
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9407
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9408
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9409
 Returns 0 on success.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9410
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9411
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9412
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9413
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9414
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9415
 .B \-1,  \-\-first
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9416
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9417
@@ -12850,7 +12822,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9418
 .B \-s,  \-\-summary
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9419
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9420
 print first line of patch header
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9421
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9422
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9423
 .SS notify
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9424
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9425
 hooks for sending email push notifications
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9426
@@ -12858,13 +12830,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9427
 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
  9428
 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
  9429
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9430
-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
  9431
+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
  9432
 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
  9433
 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
  9434
 changesets sent to another repository:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9435
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9436
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9437
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9438
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9439
 [hooks]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9440
 # one email for each incoming changeset
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9441
 incoming.notify = python:hgext.notify.hook
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9442
@@ -12873,7 +12845,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9443
 
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9444
 # one email for all outgoing changesets
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9445
 outgoing.notify = python:hgext.notify.hook
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9446
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9447
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9448
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9449
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9450
 This registers the hooks. To enable notification, subscribers must
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9451
@@ -12882,7 +12854,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9452
 multiple recipients to a single repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9453
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9454
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9455
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9456
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9457
 [usersubs]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9458
 # 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
  9459
 user@host = pattern
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9460
@@ -12890,7 +12862,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9461
 [reposubs]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9462
 # 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
  9463
 pattern = user@host
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9464
-.ft P
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
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9467
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9468
 A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9469
@@ -12898,10 +12870,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9470
 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
  9471
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9472
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9473
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9474
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9475
 [reposubs]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9476
 */widgets#branch(release) = qa\[email protected]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9477
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9478
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9479
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9480
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9481
 This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9482
@@ -12912,10 +12884,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9483
 incorporated by reference:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9484
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9485
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9486
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9487
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9488
 [notify]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9489
 config = /path/to/subscriptionsfile
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9490
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9491
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9492
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
  9493
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9494
 Notifications will not be sent until the \fBnotify.test\fP value is set
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9495
@@ -12922,7 +12894,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9496
 to \fBFalse\fP; see below.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9497
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9498
 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
  9499
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9500
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9501
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9502
 .B notify.test
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9503
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9504
@@ -12931,8 +12903,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9505
 .B notify.sources
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9506
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9507
 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
  9508
-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
  9509
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9510
+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
  9511
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9512
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9513
 .B \fBserve\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9514
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9515
@@ -12953,7 +12925,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9516
 .B \fBbundle\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9517
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9518
 changesets sent via \fBhg unbundle\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9519
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9520
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9521
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9522
 Default: serve.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9523
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9524
@@ -12996,7 +12968,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9525
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9526
 .B notify.maxsubject
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9527
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9528
-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
  9529
+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
  9530
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9531
 .B notify.diffstat
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9532
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9533
@@ -13015,11 +12987,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9534
 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
  9535
 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
  9536
 from the pushing repo.  Default: False.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9537
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9538
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9539
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9540
 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
  9541
 notifications:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9542
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9543
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9544
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9545
 .B email.from
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9546
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9547
@@ -13030,7 +13002,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9548
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9549
 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
  9550
 references. See also \fBnotify.strip\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9551
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9552
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9553
 .SS pager
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9554
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9555
 browse command output with an external pager
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9556
@@ -13038,10 +13010,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9557
 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
  9558
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9559
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9560
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9561
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9562
 [pager]
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9563
 pager = less \-FRX
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9564
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9565
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9566
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9567
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9568
 If no pager is set, the pager extensions uses the environment variable
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9569
@@ -13051,10 +13023,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9570
 pager.ignore list:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9571
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9572
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9573
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9574
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9575
 [pager]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9576
 ignore = version, help, update
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9577
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9578
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9579
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9580
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9581
 You can also enable the pager only for certain commands using
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9582
@@ -13061,10 +13033,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9583
 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
  9584
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9585
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9586
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9587
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9588
 [pager]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9589
 attend = annotate, cat, diff, export, glog, log, qdiff
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9590
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9591
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9592
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9593
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9594
 Setting pager.attend to an empty value will cause all commands to be
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9595
@@ -13077,13 +13049,13 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9596
 existing attend and ignore options and defaults:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9597
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9598
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9599
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9600
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9601
 [pager]
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9602
 attend\-cat = false
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9603
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9604
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9605
 .fi
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9606
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9607
-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
  9608
+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
  9609
 to specify them in your user configuration file.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9610
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9611
 To control whether the pager is used at all for an individual command,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9612
@@ -13090,12 +13062,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9613
 you can use \-\-pager=<value>:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9614
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9615
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9616
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9617
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9618
 \- use as needed: \(gaauto\(ga.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9619
 \- require the pager: \(gayes\(ga or \(gaon\(ga.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9620
 \- suppress the pager: \(gano\(ga or \(gaoff\(ga (any unrecognized value
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9621
 will also work).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9622
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9623
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9624
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9625
 .SS patchbomb
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9626
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9627
@@ -13107,7 +13079,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9628
 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
  9629
 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
  9630
 message contains two or three body parts:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9631
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9632
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9633
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9634
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9635
 The changeset description.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9636
@@ -13116,8 +13088,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9637
 [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
  9638
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9639
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9640
-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
  9641
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9642
+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
  9643
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9644
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9645
 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
  9646
 and References headers, so they will show up as a sequence in threaded
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9647
@@ -13127,7 +13099,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9648
 configuration file:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9649
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9650
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9651
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9652
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9653
 [email]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9654
 from = My Name <my@email>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9655
 to = recipient1, recipient2, ...
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9656
@@ -13134,13 +13106,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9657
 cc = cc1, cc2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9658
 bcc = bcc1, bcc2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9659
 reply\-to = address1, address2, ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9660
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9661
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9662
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9663
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9664
 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
  9665
 override global \fB[email]\fP address settings.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9666
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9667
-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
  9668
+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
  9669
 changesets as a patchbomb.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9670
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9671
 You can also either configure the method option in the email section
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9672
@@ -13149,15 +13121,15 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9673
 directly from the commandline. See the [email] and [smtp] sections in
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9674
 hgrc(5) for details.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9675
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9676
-By default, \%\fBhg email\fP\: will prompt for a \fBTo\fP or \fBCC\fP header if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9677
+By default, \fBhg email\fP will prompt for a \fBTo\fP or \fBCC\fP header if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9678
 you do not supply one via configuration or the command line.  You can
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9679
 override this to never prompt by configuring an empty value:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9680
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9681
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9682
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9683
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9684
 [email]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9685
 cc =
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9686
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9687
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9688
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9689
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9690
 You can control the default inclusion of an introduction message with the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9691
@@ -13165,12 +13137,12 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9692
 overwritten by command line flags like \-\-intro and \-\-desc:
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9693
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9694
 .nf
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9695
-.ft C
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9696
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9697
 [patchbomb]
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9698
 intro=auto   # include introduction message if more than 1 patch (default)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9699
 intro=never  # never include an introduction message
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9700
 intro=always # always include an introduction message
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9701
-.ft P
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9702
+.ft
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9703
 .fi
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9704
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9705
 You can set patchbomb to always ask for confirmation by setting
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9706
@@ -13181,13 +13153,13 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9707
 send changesets by email:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9708
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9709
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9710
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9711
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9712
 hg email [OPTION]... [DEST]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9713
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9714
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9715
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9716
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9717
 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
  9718
-\%\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
  9719
+\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
  9720
 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
  9721
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9722
 Each patch email has a Subject line of "[PATCH M of N] ...", using
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9723
@@ -13198,7 +13170,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9724
 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
  9725
 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
  9726
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9727
-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
  9728
+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
  9729
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9730
 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
  9731
 with a final summary of all messages and asked for confirmation before
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9732
@@ -13218,7 +13190,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9733
 With \-b/\-\-bundle, changesets are selected as for \-\-outgoing, but a
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9734
 single email containing a binary Mercurial bundle as an attachment
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9735
 will be sent. Use the \fBpatchbomb.bundletype\fP config option to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9736
-control the bundle type as with \%\fBhg bundle \-\-type\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9737
+control the bundle type as with \fBhg bundle \-\-type\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9738
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9739
 With \-m/\-\-mbox, instead of previewing each patchbomb message in a
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9740
 pager or sending the messages directly, it will create a UNIX
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9741
@@ -13237,12 +13209,12 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9742
 introductory message in \fB.hg/last\-email.txt\fP.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9743
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9744
 The default behavior of this command can be customized through
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9745
-configuration. (See \%\fBhg help patchbomb\fP\: for details)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9746
+configuration. (See \fBhg help patchbomb\fP for details)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
  9747
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9748
 Examples:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9749
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9750
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9751
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9752
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9753
 hg email \-r 3000          # send patch 3000 only
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9754
 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
  9755
 hg email \-r 3000:3005     # send patches 3000 through 3005
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9756
@@ -13263,7 +13235,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9757
 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
  9758
   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
  9759
     \-bm \-t < mbox         # ... using sendmail
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9760
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9761
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9762
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9763
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9764
 Before using this command, you will need to enable email in your
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9765
@@ -13270,7 +13242,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9766
 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
  9767
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9768
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9769
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9770
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9771
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9772
 .B \-g,  \-\-git
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9773
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9774
@@ -13387,7 +13359,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9775
 .B \-\-insecure
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9776
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9777
 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
  9778
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9779
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9780
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9781
 [+] marked option can be specified multiple times
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9782
 .SS purge
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9783
@@ -13399,9 +13371,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9784
 removes files not tracked by Mercurial:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9785
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9786
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9787
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9788
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9789
 hg purge [OPTION]... [DIR]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9790
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9791
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9792
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9793
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9794
 Delete files not known to Mercurial. This is useful to test local
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9795
@@ -13408,18 +13380,18 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9796
 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
  9797
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9798
 This means that purge will delete the following by default:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9799
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9800
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9801
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9802
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9803
-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
  9804
+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
  9805
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9806
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9807
 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
  9808
 they contain files under source control management
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9809
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9810
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9811
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9812
 But it will leave untouched:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9813
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9814
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9815
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9816
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9817
 Modified and unmodified tracked files
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9818
@@ -13428,8 +13400,8 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9819
 Ignored files (unless \-\-all is specified)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9820
 .IP \(bu 2
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9821
 .
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9822
-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
  9823
-.UNINDENT
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9824
+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
  9825
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9826
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9827
 The \-\-files and \-\-dirs options can be used to direct purge to delete
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9828
 only files, only directories, or both. If neither option is given,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9829
@@ -13444,7 +13416,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9830
 option.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9831
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9832
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9833
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9834
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9835
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9836
 .B \-a,  \-\-abort\-on\-err
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9837
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9838
@@ -13477,15 +13449,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9839
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9840
 .
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9841
 exclude names matching the given patterns
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9842
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9843
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9844
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9845
 [+] marked option can be specified multiple times
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9846
-.INDENT 0.0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9847
-.INDENT 3.5
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9848
+.RS 0
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9849
+.RS 3
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9850
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9851
 aliases: clean
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9852
-.UNINDENT
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9853
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9854
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9855
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9856
 .SS rebase
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9857
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9858
 command to move sets of revisions to a different ancestor
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9859
@@ -13494,7 +13466,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9860
 repository.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9861
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9862
 For more information:
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9863
-\%https://mercurial\-scm.org/wiki/RebaseExtension\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9864
+https://mercurial\-scm.org/wiki/RebaseExtension
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9865
 .SS Commands
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9866
 .SS rebase
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9867
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9868
@@ -13501,9 +13473,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9869
 move changeset (and descendants) to a different branch:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
  9870
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9871
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9872
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9873
+.ft
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9874
 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
  9875
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9876
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9877
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9878
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9879
 Rebase uses repeated merging to graft changesets from one part of
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9880
@@ -13511,18 +13483,18 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9881
 useful for linearizing \fIlocal\fP changes relative to a master
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9882
 development tree.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9883
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9884
-Published commits cannot be rebased (see \%\fBhg help phases\fP\:).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9885
-To copy commits, see \%\fBhg help graft\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9886
+Published commits cannot be rebased (see \fBhg help phases\fP).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9887
+To copy commits, see \fBhg help graft\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
  9888
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
  9889
-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
  9890
+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
  9891
 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
  9892
 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
  9893
 changesets are added as its descendants.)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9894
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9895
 Here are the ways to select changesets:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9896
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9897
-.INDENT 3.5
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9898
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9899
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9900
+.RS 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9901
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9902
 .IP 1. 3
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9903
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9904
 Explicitly select them using \fB\-\-rev\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9905
@@ -13538,9 +13510,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9906
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9907
 If you do not specify any of \fB\-\-rev\fP, \fBsource\fP, or \fB\-\-base\fP,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9908
 rebase will use \fB\-\-base .\fP as above.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9909
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9910
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9911
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9912
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9913
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9914
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9915
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9916
 Rebase will destroy original changesets unless you use \fB\-\-keep\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9917
 It will also move your bookmarks (even if you do).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9918
@@ -13556,7 +13528,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9919
 continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9920
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9921
 Examples:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9922
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9923
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9924
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9925
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9926
 move "local changes" (current commit back to branching point)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9927
@@ -13563,9 +13535,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9928
 to the current branch tip after a pull:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9929
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9930
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9931
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9932
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9933
 hg rebase
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9934
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9935
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9936
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9937
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9938
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9939
@@ -13572,9 +13544,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9940
 move a single changeset to the stable branch:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9941
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9942
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9943
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9944
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9945
 hg rebase \-r 5f493448 \-d stable
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9946
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9947
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9948
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9949
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9950
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9951
@@ -13581,9 +13553,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9952
 splice a commit and all its descendants onto another part of history:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9953
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9954
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9955
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9956
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9957
 hg rebase \-\-source c0c3 \-\-dest 4cf9
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9958
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9959
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9960
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9961
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9962
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9963
@@ -13591,9 +13563,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9964
 default branch:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9965
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9966
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9967
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9968
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9969
 hg rebase \-\-base myfeature \-\-dest default
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9970
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9971
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9972
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9973
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9974
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9975
@@ -13600,9 +13572,9 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9976
 collapse a sequence of changes into a single commit:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9977
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9978
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9979
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9980
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9981
 hg rebase \-\-collapse \-r 1520:1525 \-d .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9982
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9983
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9984
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9985
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9986
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
  9987
@@ -13609,17 +13581,17 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9988
 move a named branch while preserving its name:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9989
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9990
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9991
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9992
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9993
 hg rebase \-r "branch(featureX)" \-d 1.3 \-\-keepbranches
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9994
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9995
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9996
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9997
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9998
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
  9999
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10000
 Returns 0 on success, 1 if nothing to rebase or there are
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10001
 unresolved conflicts.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10002
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10003
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10004
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10005
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10006
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10007
 .BI \-s,  \-\-source \ <REV>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10008
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10009
@@ -13688,7 +13660,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10010
 .BI \-T,  \-\-template \ <TEMPLATE>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10011
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10012
 display with template
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10013
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10014
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10015
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10016
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10017
 .SS record
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10018
@@ -13700,12 +13672,12 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10019
 interactively record a new patch:
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10020
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10021
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10022
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10023
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10024
 hg qrecord [OPTION]... PATCH [FILE]...
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10025
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10026
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10027
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10028
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10029
-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
 10030
+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
 10031
 usage.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10032
 .SS record
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10033
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10034
@@ -13712,15 +13684,15 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10035
 interactively select changes to commit:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10036
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10037
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10038
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10039
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10040
 hg record [OPTION]... [FILE]...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10041
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10042
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10043
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10044
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10045
-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
 10046
+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
 10047
 will be candidates for recording.
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
-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
 10050
+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
 10051
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10052
 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
 10053
 modified file, and for files with multiple changes, for each
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10054
@@ -13728,7 +13700,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10055
 possible:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10056
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10057
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10058
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10059
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10060
 y \- record this change
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10061
 n \- skip this change
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10062
 e \- edit this change manually
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10063
@@ -13741,13 +13713,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10064
 q \- quit, recording no changes
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10065
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10066
 ? \- display help
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10067
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10068
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10069
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10070
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10071
 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
 10072
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10073
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10074
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10075
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10076
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10077
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10078
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10079
@@ -13808,7 +13780,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10080
 .B \-B,  \-\-ignore\-blank\-lines
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10081
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10082
 ignore changes whose lines are all blank
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10083
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10084
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10085
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10086
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10087
 .SS relink
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10088
@@ -13820,9 +13792,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10089
 recreate hardlinks between two repositories:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10090
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10091
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10092
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10093
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10094
 hg relink [ORIGIN]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10095
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10096
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10097
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10098
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10099
 When repositories are cloned locally, their data files will be
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10100
@@ -13854,18 +13826,18 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10101
 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
 10102
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10103
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10104
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10105
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10106
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10107
 py = http://code.python.org/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10108
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10109
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10110
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10111
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10112
 After that you can use it like:
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
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10115
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10116
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10117
 hg clone py://trunk/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10118
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10119
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10120
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10121
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10122
 Additionally there is support for some more complex schemas, for
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10123
@@ -13872,10 +13844,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10124
 example used by Google Code:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10125
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10126
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10127
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10128
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10129
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10130
 gcode = http://{1}.googlecode.com/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10131
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10132
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10133
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10134
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10135
 The syntax is taken from Mercurial templates, and you have unlimited
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10136
@@ -13887,7 +13859,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10137
 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
 10138
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10139
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10140
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10141
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10142
 [schemes]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10143
 py = http://hg.python.org/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10144
 bb = https://bitbucket.org/
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10145
@@ -13894,7 +13866,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10146
 bb+ssh = ssh://[email protected]/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10147
 gcode = https://{1}.googlecode.com/hg/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10148
 kiln = https://{1}.kilnhg.com/Repo/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10149
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10150
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10151
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10152
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10153
 You can override a predefined scheme by defining a new scheme with the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10154
@@ -13904,19 +13876,19 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10155
 share a common history between several working directories
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10156
 .SS Automatic Pooled Storage for Clones
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10157
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10158
-When this extension is active, \%\fBhg clone\fP\: can be configured to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10159
+When this extension is active, \fBhg clone\fP can be configured to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10160
 automatically share/pool storage across multiple clones. This
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10161
-mode effectively converts \%\fBhg clone\fP\: to \%\fBhg clone\fP\: + \%\fBhg share\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10162
+mode effectively converts \fBhg clone\fP to \fBhg clone\fP + \fBhg share\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10163
 The benefit of using this mode is the automatic management of
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10164
 store paths and intelligent pooling of related repositories.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10165
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10166
 The following \fBshare.\fP config options influence this feature:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10167
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10168
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10169
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10170
 .B \fBshare.pool\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10171
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10172
 Filesystem path where shared repository data will be stored. When
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10173
-defined, \%\fBhg clone\fP\: will automatically use shared repository
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10174
+defined, \fBhg clone\fP will automatically use shared repository
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10175
 storage instead of creating a store inside each clone.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10176
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10177
 .B \fBshare.poolnaming\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10178
@@ -13928,13 +13900,13 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10179
 root/initial changeset is identical. In this mode, the local shared
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10180
 repository is an aggregate of all encountered remote repositories.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10181
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10182
-"remote" means the name is derived from the source repository\(aqs
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10183
+"remote" means the name is derived from the source repository's
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10184
 path or URL. In this mode, storage is only shared if the path or URL
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10185
-requested in the \%\fBhg clone\fP\: command matches exactly to a repository
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10186
+requested in the \fBhg clone\fP command matches exactly to a repository
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10187
 that was cloned before.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10188
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10189
 The default naming mode is "identity."
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10190
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10191
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10192
 .SS Commands
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10193
 .SS share
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10194
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10195
@@ -13941,9 +13913,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10196
 create a new shared repository:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10197
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10198
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10199
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10200
+.ft
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10201
 hg share [\-U] [\-B] SOURCE [DEST]
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10202
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10203
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10204
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10205
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10206
 Initialize a new repository and working directory that shares its
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10207
@@ -13961,7 +13933,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10208
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10209
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10210
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10211
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10212
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10213
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10214
 .B \-U,  \-\-noupdate
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10215
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10216
@@ -13970,15 +13942,15 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10217
 .B \-B,  \-\-bookmarks
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10218
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10219
 also share bookmarks
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10220
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10221
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10222
 .SS unshare
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10223
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10224
 convert a shared repository to a normal one:
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10225
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10226
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10227
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10228
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10229
 hg unshare
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10230
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10231
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10232
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10233
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10234
 Copy the store data to the repo and remove the sharedpath data.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10235
@@ -13992,7 +13964,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10236
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10237
 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
 10238
 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
 10239
-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
 10240
+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
 10241
 conflicts if necessary.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10242
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10243
 You can have more than one shelved change outstanding at a time; each
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10244
@@ -14004,9 +13976,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10245
 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
 10246
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10247
 .nf
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10248
-.ft C
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10249
+.ft
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10250
 hg shelve [OPTION]... [FILE]...
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10251
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10252
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10253
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10254
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10255
 Shelving takes files that "hg status" reports as not clean, saves
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10256
@@ -14034,7 +14006,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10257
 all shelved changes, use \fB\-\-cleanup\fP.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10258
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10259
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10260
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10261
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10262
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10263
 .B \-A,  \-\-addremove
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10264
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10265
@@ -14091,7 +14063,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10266
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10267
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10268
 exclude names matching the given patterns
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10269
-.UNINDENT
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10270
+.RE
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10271
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10272
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10273
 .SS unshelve
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10274
@@ -14099,9 +14071,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10275
 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
 10276
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10277
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10278
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10279
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10280
 hg unshelve [SHELVED]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10281
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10282
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10283
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10284
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10285
 This command accepts an optional name of a shelved change to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10286
@@ -14132,7 +14104,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10287
 prevents from deciding exact order of them, for safety.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10288
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10289
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10290
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10291
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10292
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10293
 .B \-a,  \-\-abort
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10294
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10295
@@ -14153,7 +14125,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10296
 .BI \-\-date \ <DATE>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10297
 .
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10298
 set date for temporary commits (DEPRECATED)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10299
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10300
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10301
 .SS strip
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10302
 .sp
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10303
 strip changesets and their descendants from history
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10304
@@ -14166,9 +14138,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10305
 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
 10306
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10307
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10308
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10309
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10310
 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
 10311
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10312
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10313
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10314
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10315
 The strip command removes the specified changesets and all their
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10316
@@ -14182,8 +14154,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10317
 completes.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10318
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10319
 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
 10320
-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
 10321
-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
 10322
+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
 10323
+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
 10324
 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
 10325
 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
 10326
 restore.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10327
@@ -14198,7 +14170,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10328
 Return 0 on success.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10329
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10330
 Options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10331
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10332
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10333
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10334
 .BI \-r,  \-\-rev \ <REV[+]>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10335
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10336
@@ -14227,7 +14199,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10337
 .BI \-B,  \-\-bookmark \ <VALUE[+]>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10338
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10339
 remove revs only reachable from given bookmark
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10340
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10341
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10342
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10343
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10344
 .SS transplant
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10345
@@ -14235,7 +14207,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10346
 command to transplant changesets from another branch
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10347
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10348
 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
 10349
-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
 10350
+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
 10351
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10352
 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
 10353
 map from a changeset hash to its hash in the source repository.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10354
@@ -14245,9 +14217,9 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10355
 transplant changesets from another branch:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10356
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10357
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10358
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10359
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10360
 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
 10361
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10362
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10363
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10364
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10365
 Selected changesets will be applied on top of the current working
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10366
@@ -14264,9 +14236,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10367
 of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10368
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10369
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10370
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10371
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10372
 (transplanted from CHANGESETHASH)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10373
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10374
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10375
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10376
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10377
 You can rewrite the changelog message with the \-\-filter option.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10378
@@ -14282,17 +14254,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10379
 with \-\-branch will be transplanted.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10380
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10381
 Example:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10382
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10383
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10384
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10385
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10386
 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
 10387
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10388
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10389
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10390
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10391
 hg transplant \-\-branch REV \-\-all
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10392
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10393
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10394
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10395
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10396
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10397
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10398
 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
 10399
 changesets. You will not be prompted to transplant any ancestors
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10400
@@ -14300,17 +14272,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10401
 normally instead of transplanting them.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10402
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10403
 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
 10404
-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
 10405
+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
 10406
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10407
-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
 10408
+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
 10409
 start an interactive changeset browser.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10410
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10411
 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
 10412
-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
 10413
-\-\-continue/\-c\fP\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10414
+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
 10415
+\-\-continue/\-c\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10416
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10417
 Options:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10418
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10419
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10420
 .TP
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10421
 .BI \-s,  \-\-source \ <REPO>
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10422
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10423
@@ -14351,7 +14323,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10424
 .BI \-\-filter \ <CMD>
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10425
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10426
 filter changesets through command
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10427
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10428
+.RE
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10429
 .sp
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10430
 [+] marked option can be specified multiple times
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10431
 .SS win32mbcs
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10432
@@ -14366,7 +14338,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10433
 operation.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10434
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10435
 This extension is useful for:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10436
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10437
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10438
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10439
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10440
 Japanese Windows users using shift_jis encoding.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10441
@@ -14377,10 +14349,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10442
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10443
 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
 10444
 case\-insensitive file system.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10445
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10446
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10447
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10448
 This extension is not needed for:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10449
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10450
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10451
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10452
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10453
 Any user who use only ASCII chars in path.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10454
@@ -14387,10 +14359,10 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10455
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10456
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10457
 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
 10458
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10459
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10460
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10461
 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
 10462
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10463
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10464
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10465
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10466
 You should use single encoding in one repository.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10467
@@ -14400,16 +14372,16 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10468
 .IP \(bu 2
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10469
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10470
 win32mbcs is not compatible with fixutf8 extension.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10471
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10472
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10473
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10474
 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
 10475
 You can specify the encoding by config option:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10476
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10477
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10478
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10479
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10480
 [win32mbcs]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10481
 encoding = sjis
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10482
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10483
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10484
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10485
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10486
 It is useful for the users who want to commit with UTF\-8 log message.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10487
@@ -14416,8 +14388,8 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10488
 .SS win32text
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10489
 .sp
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 10490
 perform automatic newline conversion (DEPRECATED)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10491
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10492
-.INDENT 3.5
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10493
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10494
+.RS 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10495
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10496
 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
 10497
 the extension again and again for each clone since the configuration
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10498
@@ -14426,13 +14398,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10499
 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
 10500
 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
 10501
 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
 10502
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10503
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10504
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10505
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10506
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10507
 To perform automatic newline conversion, use:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10508
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10509
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10510
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10511
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10512
 [extensions]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10513
 win32text =
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10514
 [encode]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10515
@@ -14442,17 +14414,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10516
 [decode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10517
 ** = cleverdecode:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10518
 # or ** = macdecode:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10519
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10520
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10521
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10522
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10523
 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
 10524
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10525
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10526
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10527
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10528
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10529
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10530
 # or pretxncommit.cr = python:hgext.win32text.forbidcr
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10531
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10532
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10533
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10534
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10535
 To do the same check on a server to prevent CRLF/CR from being
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10536
@@ -14459,11 +14431,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10537
 pushed or pulled:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10538
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10539
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10540
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10541
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10542
 [hooks]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10543
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10544
 # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10545
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10546
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10547
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10548
 .SS zeroconf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10549
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10550
@@ -14474,33 +14446,33 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10551
 without knowing their actual IP address.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10552
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10553
 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
 10554
-\%\fBhg serve\fP\: in your repository:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10555
+\fBhg serve\fP in your repository:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10556
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10557
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10558
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10559
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10560
 $ cd test
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10561
 $ hg serve
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10562
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10563
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10564
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10565
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10566
 You can discover Zeroconf\-enabled repositories by running
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10567
-\%\fBhg paths\fP\::
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10568
+\fBhg paths\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10569
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10570
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10571
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10572
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10573
 $ hg paths
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10574
 zc\-test = http://example.com:8000/test
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10575
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10576
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10577
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10578
 .SH FILES
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10579
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10580
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10581
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10582
 .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
 10583
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10584
 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
 10585
-\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
 10586
+\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
 10587
 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
 10588
-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
 10589
+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
 10590
 files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10591
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10592
 .B \fB.hgignore\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10593
@@ -14507,13 +14479,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10594
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10595
 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
 10596
 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
 10597
-see \%\fBhgignore\fP(5)\:.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10598
+see \fBhgignore\fP(5).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10599
 .TP
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10600
 .B \fB.hgsub\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10601
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10602
 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
 10603
 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
 10604
-\%\fBhg help subrepos\fP\:.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10605
+\fBhg help subrepos\fP.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10606
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10607
 .B \fB.hgsubstate\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10608
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10609
@@ -14528,7 +14500,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10610
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10611
 .B \fB.hg/last\-message.txt\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10612
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10613
-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
 10614
+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
 10615
 in case the commit fails.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10616
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10617
 .B \fB.hg/localtags\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10618
@@ -14536,28 +14508,34 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10619
 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
 10620
 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
 10621
 encoded using the local system encoding.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10622
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10623
+.TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10624
+.B \fB/usr/demo/mercurial\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10625
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10626
+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
 10627
+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
 10628
+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
 10629
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10630
+.sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10631
 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
 10632
 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
 10633
 it will be overwritten.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10634
 .SH BUGS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10635
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10636
-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
 10637
+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
 10638
 below) when you find them.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10639
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10640
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10641
-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10642
+\fBhgignore\fP(5), \fBhgrc\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10643
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10644
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10645
-Written by Matt Mackall <\%[email protected]\:>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10646
+Written by Matt Mackall <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10647
 .SH RESOURCES
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10648
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10649
-Main Web Site: \%https://mercurial\-scm.org/\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10650
+Main Web Site: https://mercurial\-scm.org/
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10651
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10652
-Source code repository: \%http://selenic.com/hg\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10653
+Source code repository: http://selenic.com/hg
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10654
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10655
-Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10656
+Mailing list: http://selenic.com/mailman/listinfo/mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10657
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10658
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10659
 Copyright (C) 2005\-2016 Matt Mackall.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10660
--- mercurial-3.7.1/doc/hgignore.5.orig	Wed Feb  3 14:00:05 2016
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10661
+++ mercurial-3.7.1/doc/hgignore.5	Thu Feb  4 10:13:47 2016
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10662
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10663
 .TH HGIGNORE 5 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10664
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10665
 hgignore \- syntax for Mercurial ignore files
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10666
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10667
-.nr rst2man-indent-level 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10668
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10669
-.de1 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10670
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10671
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10672
-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
 10673
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10674
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10675
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10676
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10677
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10678
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10679
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10680
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10681
-. 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
 10682
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10683
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10684
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10685
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10686
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10687
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10688
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10689
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10690
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10691
-.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
 10692
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10693
 .SH SYNOPSIS
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10694
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10695
 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
 10696
@@ -55,16 +28,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10697
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10698
 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
 10699
 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
 10700
-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
 10701
+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
 10702
 configure these files.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10703
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10704
-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
 10705
+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
 10706
 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
 10707
-\%\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
 10708
+\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
 10709
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10710
 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
 10711
 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
 10712
-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
 10713
+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
 10714
 in .hgignore.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10715
 .SH SYNTAX
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10716
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10717
@@ -79,13 +52,13 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10718
 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
 10719
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10720
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10721
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10722
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10723
 syntax: NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10724
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10725
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10726
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10727
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10728
 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
 10729
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10730
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10731
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10732
 .B \fBregexp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10733
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10734
@@ -94,7 +67,7 @@
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10735
 .B \fBglob\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10736
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10737
 Shell\-style glob.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10738
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10739
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10740
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10741
 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
 10742
 follow, until another syntax is selected.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10743
@@ -106,11 +79,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10744
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10745
 Subdirectories can have their own .hgignore settings by adding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10746
 \fBsubinclude:path/to/subdir/.hgignore\fP to the root \fB.hgignore\fP. See
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10747
-\%\fBhg help patterns\fP\: for details on \fBsubinclude:\fP and \fBinclude:\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10748
+\fBhg help patterns\fP for details on \fBsubinclude:\fP and \fBinclude:\fP.
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10749
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10750
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10751
 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
 10752
-Please see \%\fBhg help patterns\fP\: for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10753
+Please see \fBhg help patterns\fP for details.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10754
 .RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10755
 .SH EXAMPLE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10756
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10757
@@ -117,7 +90,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10758
 Here is an example ignore file.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10759
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10760
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10761
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10762
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10763
 # use glob syntax.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10764
 syntax: glob
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10765
 
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10766
@@ -128,16 +101,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10767
 # switch to regexp syntax.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10768
 syntax: regexp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10769
 ^\e.pc/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10770
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10771
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10772
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10773
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10774
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10775
-Vadim Gelfer <\%[email protected]\:>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10776
+Vadim Gelfer <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10777
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10778
-Mercurial was written by Matt Mackall <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10779
+Mercurial was written by Matt Mackall <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10780
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10781
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10782
-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10783
+\fBhg\fP(1), \fBhgrc\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10784
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10785
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10786
 This manual page is copyright 2006 Vadim Gelfer.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10787
--- mercurial-3.7.1/doc/hgrc.5.orig	Wed Feb  3 14:00:02 2016
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10788
+++ mercurial-3.7.1/doc/hgrc.5	Thu Feb  4 10:13:51 2016
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10789
@@ -3,33 +3,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10790
 .TH HGRC 5 "" "" "Mercurial Manual"
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10791
 .SH NAME
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10792
 hgrc \- configuration files for Mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10793
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10794
-.nr rst2man-indent-level 0
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10795
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10796
-.de1 rstReportMargin
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10797
-\\$1 \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10798
-level \\n[rst2man-indent-level]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10799
-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
 10800
--
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10801
-\\n[rst2man-indent0]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10802
-\\n[rst2man-indent1]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10803
-\\n[rst2man-indent2]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10804
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10805
-.de1 INDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10806
-.\" .rstReportMargin pre:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10807
-. RS \\$1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10808
-. 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
 10809
-. nr rst2man-indent-level +1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10810
-.\" .rstReportMargin post:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10811
-..
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10812
-.de UNINDENT
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10813
-. RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10814
-.\" indent \\n[an-margin]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10815
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10816
-.nr rst2man-indent-level -1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10817
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10818
-.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
 10819
-..
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10820
 .SH DESCRIPTION
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10821
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10822
 The Mercurial system uses a set of configuration files to control
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10823
@@ -36,11 +9,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10824
 aspects of its behavior.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10825
 .SH TROUBLESHOOTING
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10826
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10827
-If you\(aqre having problems with your configuration,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10828
-\%\fBhg config \-\-debug\fP\: can help you understand what is introducing
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10829
+If you're having problems with your configuration,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10830
+\fBhg config \-\-debug\fP can help you understand what is introducing
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10831
 a setting into your environment.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10832
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10833
-See \%\fBhg help config.syntax\fP\: and \%\fBhg help config.files\fP\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10834
+See \fBhg help config.syntax\fP and \fBhg help config.files\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10835
 for information about how and where to override things.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10836
 .SH STRUCTURE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10837
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10838
@@ -49,15 +22,15 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10839
 by \fBname = value\fP entries:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10840
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10841
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10842
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10843
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10844
 [ui]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10845
 username = Firstname Lastname <[email protected]>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10846
 verbose = True
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10847
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10848
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10849
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10850
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 10851
 The above entries will be referred to as \fBui.username\fP and
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10852
-\fBui.verbose\fP, respectively. See \%\fBhg help config.syntax\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10853
+\fBui.verbose\fP, respectively. See \fBhg help config.syntax\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10854
 .SH FILES
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10855
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10856
 Mercurial reads configuration data from several files, if they exist.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10857
@@ -67,16 +40,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10858
 Local configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10859
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10860
 Global configuration like the username setting is typically put into:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10861
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10862
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10863
 .IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10864
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10865
-\fB%USERPROFILE%\emercurial.ini\fP (on Windows)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10866
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10867
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10868
-.IP \(bu 2
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10869
-.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10870
 \fB$HOME/.hgrc\fP (on Unix, Plan9)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10871
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10872
+.RE
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10873
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 10874
 The names of these files depend on the system on which Mercurial is
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10875
 installed. \fB*.rc\fP files from a single directory are read in
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10876
@@ -84,8 +52,8 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10877
 paths are given below, settings from earlier paths override later
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10878
 ones.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10879
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10880
-On Unix, the following files are consulted:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10881
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10882
+The following files are consulted:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10883
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10884
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10885
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10886
 \fB<repo>/.hg/hgrc\fP (per\-repository)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10887
@@ -107,79 +75,16 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10888
 .IP \(bu 2
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10889
 .
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10890
 \fB<internal>/default.d/*.rc\fP (defaults)
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10891
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10892
-.sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10893
-On Windows, the following files are consulted:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10894
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10895
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10896
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10897
-\fB<repo>/.hg/hgrc\fP (per\-repository)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10898
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10899
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10900
-\fB%USERPROFILE%\e.hgrc\fP (per\-user)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10901
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10902
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10903
-\fB%USERPROFILE%\eMercurial.ini\fP (per\-user)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10904
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10905
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10906
-\fB%HOME%\e.hgrc\fP (per\-user)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10907
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10908
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10909
-\fB%HOME%\eMercurial.ini\fP (per\-user)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10910
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10911
-.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10912
-\fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP (per\-installation)
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10913
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10914
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10915
-\fB<install\-dir>\ehgrc.d\e*.rc\fP (per\-installation)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10916
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10917
-.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10918
-\fB<install\-dir>\eMercurial.ini\fP (per\-installation)
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10919
-.IP \(bu 2
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10920
-.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10921
-\fB<internal>/default.d/*.rc\fP (defaults)
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10922
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10923
-.IP Note
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10924
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10925
-The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10926
-is used when running 32\-bit Python on 64\-bit Windows.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10927
 .RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10928
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10929
-On Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10930
-.sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10931
-On Plan9, the following files are consulted:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10932
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10933
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10934
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10935
-\fB<repo>/.hg/hgrc\fP (per\-repository)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10936
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10937
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10938
-\fB$home/lib/hgrc\fP (per\-user)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10939
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10940
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10941
-\fB<install\-root>/lib/mercurial/hgrc\fP (per\-installation)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10942
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10943
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10944
-\fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP (per\-installation)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10945
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10946
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10947
-\fB/lib/mercurial/hgrc\fP (per\-system)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10948
-.IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10949
-.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 10950
-\fB/lib/mercurial/hgrc.d/*.rc\fP (per\-system)
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10951
-.IP \(bu 2
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10952
-.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10953
-\fB<internal>/default.d/*.rc\fP (defaults)
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10954
-.UNINDENT
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10955
-.sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10956
 Per\-repository configuration options only apply in a
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10957
 particular repository. This file is not version\-controlled, and
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10958
 will not get transferred during a "clone" operation. Options in
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10959
 this file override options in all other configuration files.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10960
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10961
-On Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10962
+On Unix, most of this file will be ignored if it doesn't
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10963
 belong to a trusted user or to a trusted group. See
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10964
-\%\fBhg help config.trusted\fP\: for more details.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10965
+\fBhg help config.trusted\fP for more details.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10966
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10967
 Per\-user configuration file(s) are for the user running Mercurial.  Options
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10968
 in these files apply to all Mercurial commands executed by this user in any
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10969
@@ -197,10 +102,8 @@
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10970
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10971
 Per\-installation configuration files are for the system on
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10972
 which Mercurial is running. Options in these files apply to all
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10973
-Mercurial commands executed by any user in any directory. Registry
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10974
-keys contain PATH\-like strings, every part of which must reference
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10975
-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10976
-be read.  Mercurial checks each of these locations in the specified
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10977
+Mercurial commands executed by any user in any directory.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10978
+Mercurial checks each of these locations in the specified
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10979
 order until one or more configuration files are detected.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10980
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 10981
 Per\-system configuration files are for the system on which Mercurial
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10982
@@ -221,12 +124,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10983
 \fBconfiguration keys\fP):
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10984
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10985
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10986
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10987
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10988
 [spam]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10989
 eggs=ham
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10990
 green=
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10991
    eggs
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10992
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10993
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10994
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10995
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10996
 Each line contains one entry. If the lines that follow are indented,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 10997
@@ -238,12 +141,12 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 10998
 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
 10999
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11000
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11001
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11002
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11003
 [spam]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11004
 eggs=large
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11005
 ham=serrano
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11006
 eggs=small
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11007
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11008
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11009
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11010
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11011
 This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11012
@@ -253,7 +156,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11013
 example:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11014
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11015
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11016
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11017
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11018
 [foo]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11019
 eggs=large
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11020
 ham=serrano
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11021
@@ -268,7 +171,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11022
 ham=prosciutto
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11023
 eggs=medium
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11024
 bread=toasted
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11025
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11026
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11027
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11028
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11029
 This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11030
@@ -290,9 +193,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11031
 \fBfile\fP. This lets you do something like:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11032
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11033
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11034
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11035
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11036
 %include ~/.hgrc.d/$HOST.rc
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11037
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11038
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11039
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11040
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11041
 to include a different configuration file on each computer you use.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11042
@@ -309,9 +212,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11043
 placed in double quotation marks:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11044
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11045
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11046
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11047
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11048
 allow_read = "John Doe, PhD", brian, betty
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11049
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11050
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11051
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11052
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11053
 Quotation marks can be escaped by prefixing them with a backslash. Only
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11054
@@ -336,17 +239,17 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11055
 Alias definitions consist of lines of the form:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11056
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11057
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11058
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11059
+.ft
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11060
 <alias> = <command> [<argument>]...
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11061
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11062
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11063
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11064
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11065
 For example, this definition:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11066
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11067
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11068
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11069
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11070
 latest = log \-\-limit 5
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11071
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11072
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11073
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11074
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11075
 creates a new command \fBlatest\fP that shows only the five most recent
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11076
@@ -353,9 +256,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11077
 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
 11078
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11079
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11080
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11081
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11082
 stable5 = latest \-b stable
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11083
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11084
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11085
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11086
 .IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11087
 .
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11088
@@ -369,9 +272,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11089
 run arbitrary commands. As an example,
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11090
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11091
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11092
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11093
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11094
 echo = !echo $@
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11095
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11096
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11097
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11098
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11099
 will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11100
@@ -378,9 +281,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11101
 terminal. A better example might be:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11102
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11103
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11104
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11105
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11106
 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
 11107
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11108
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11109
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11110
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11111
 which will make \fBhg purge\fP delete all unknown files in the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11112
@@ -408,9 +311,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11113
 .SS \fBannotate\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11114
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11115
 Settings used when displaying file annotations. All values are
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11116
-Booleans and default to False. See \%\fBhg help config.diff\fP\: for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11117
+Booleans and default to False. See \fBhg help config.diff\fP for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11118
 related options for the diff command.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11119
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11120
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11121
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11122
 .B \fBignorews\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11123
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11124
@@ -423,20 +326,20 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11125
 .B \fBignoreblanklines\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11126
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11127
 Ignore changes whose lines are all blank.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11128
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11129
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11130
 .SS \fBauth\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11131
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11132
 Authentication credentials for HTTP authentication. This section
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11133
 allows you to store usernames and passwords for use when logging
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11134
-\fIinto\fP HTTP servers. See \%\fBhg help config.web\fP\: if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11135
+\fIinto\fP HTTP servers. See \fBhg help config.web\fP if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11136
 you want to configure \fIwho\fP can login to your HTTP server.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11137
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11138
 Each line has the following format:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11139
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11140
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11141
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11142
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11143
 <name>.<argument> = <value>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11144
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11145
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11146
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11147
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11148
 where \fB<name>\fP is used to group arguments into authentication
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11149
@@ -443,7 +346,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11150
 entries. Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11151
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11152
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11153
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11154
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11155
 foo.prefix = hg.intevation.org/mercurial
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11156
 foo.username = foo
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11157
 foo.password = bar
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11158
@@ -453,11 +356,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11159
 bar.key = path/to/file.key
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11160
 bar.cert = path/to/file.cert
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11161
 bar.schemes = https
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11162
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11163
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11164
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11165
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11166
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11167
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11168
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11169
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11170
 .B \fBprefix\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11171
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11172
@@ -464,7 +367,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11173
 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
 11174
 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
 11175
 (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
 11176
-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
 11177
+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
 11178
 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
 11179
 argument, q.v., is then subsequently consulted.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11180
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11181
@@ -496,195 +399,195 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11182
 .B \fBschemes\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11183
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11184
 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
 11185
-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
 11186
+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
 11187
 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
 11188
 static\-http and static\-https respectively, as well.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11189
 (default: https)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11190
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11191
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11192
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11193
 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
 11194
 for credentials as usual if required by the remote.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11195
 .SS \fBcommittemplate\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11196
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11197
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11198
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11199
 .B \fBchangeset\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11200
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11201
 String: configuration in this section is used as the template to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11202
 customize the text shown in the editor when committing.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11203
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11204
+.RE
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11205
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11206
 In addition to pre\-defined template keywords, commit log specific one
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11207
 below can be used for customization:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11208
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11209
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11210
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11211
 .B \fBextramsg\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11212
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11213
-String: Extra message (typically \(aqLeave message empty to abort
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11214
-commit.\(aq). This may be changed by some commands or extensions.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11215
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11216
+String: Extra message (typically 'Leave message empty to abort
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11217
+commit.'). This may be changed by some commands or extensions.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11218
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11219
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11220
 For example, the template configuration below shows as same text as
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11221
 one shown by default:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11222
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11223
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11224
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11225
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11226
 [committemplate]
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11227
 changeset = {desc}\en\en
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11228
-    HG: Enter commit message.  Lines beginning with \(aqHG:\(aq are removed.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11229
+    HG: Enter commit message.  Lines beginning with 'HG:' are removed.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11230
     HG: {extramsg}
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11231
     HG: \-\-
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11232
     HG: user: {author}\en{ifeq(p2rev, "\-1", "",
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11233
    "HG: branch merge\en")
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11234
-   }HG: branch \(aq{branch}\(aq\en{if(activebookmark,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11235
-   "HG: bookmark \(aq{activebookmark}\(aq\en")   }{subrepos %
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11236
+   }HG: branch '{branch}'\en{if(activebookmark,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11237
+   "HG: bookmark '{activebookmark}'\en")   }{subrepos %
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11238
    "HG: subrepo {subrepo}\en"              }{file_adds %
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11239
    "HG: added {file}\en"                   }{file_mods %
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11240
    "HG: changed {file}\en"                 }{file_dels %
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11241
    "HG: removed {file}\en"                 }{if(files, "",
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11242
    "HG: no files changed\en")}
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11243
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11244
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11245
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11246
 .IP Note
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11247
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11248
-For some problematic encodings (see \%\fBhg help win32mbcs\fP\: for
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11249
+For some problematic encodings (see \fBhg help win32mbcs\fP for
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11250
 detail), this customization should be configured carefully, to
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11251
 avoid showing broken characters.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11252
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11253
 For example, if a multibyte character ending with backslash (0x5c) is
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11254
-followed by the ASCII character \(aqn\(aq in the customized template,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11255
-the sequence of backslash and \(aqn\(aq is treated as line\-feed unexpectedly
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11256
+followed by the ASCII character 'n' in the customized template,
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11257
+the sequence of backslash and 'n' is treated as line\-feed unexpectedly
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11258
 (and the multibyte character is broken, too).
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11259
 .RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11260
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11261
 Customized template is used for commands below (\fB\-\-edit\fP may be
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11262
 required):
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11263
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11264
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11265
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11266
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11267
-\%\fBhg backout\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11268
+\fBhg backout\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11269
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11270
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11271
-\%\fBhg commit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11272
+\fBhg commit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11273
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11274
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11275
-\%\fBhg fetch\fP\: (for merge commit only)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11276
+\fBhg fetch\fP (for merge commit only)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11277
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11278
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11279
-\%\fBhg graft\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11280
+\fBhg graft\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11281
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11282
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11283
-\%\fBhg histedit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11284
+\fBhg histedit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11285
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11286
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11287
-\%\fBhg import\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11288
+\fBhg import\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11289
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11290
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11291
-\%\fBhg qfold\fP\:, \%\fBhg qnew\fP\: and \%\fBhg qrefresh\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11292
+\fBhg qfold\fP, \fBhg qnew\fP and \fBhg qrefresh\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11293
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11294
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11295
-\%\fBhg rebase\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11296
+\fBhg rebase\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11297
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11298
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11299
-\%\fBhg shelve\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11300
+\fBhg shelve\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11301
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11302
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11303
-\%\fBhg sign\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11304
+\fBhg sign\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11305
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11306
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11307
-\%\fBhg tag\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11308
+\fBhg tag\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11309
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11310
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11311
-\%\fBhg transplant\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11312
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11313
+\fBhg transplant\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11314
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11315
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11316
 Configuring items below instead of \fBchangeset\fP allows showing
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11317
 customized message only for specific actions, or showing different
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11318
 messages for each action.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11319
-.INDENT 0.0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11320
+.RS 0
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11321
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11322
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11323
-\fBchangeset.backout\fP for \%\fBhg backout\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11324
+\fBchangeset.backout\fP for \fBhg backout\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11325
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11326
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11327
-\fBchangeset.commit.amend.merge\fP for \%\fBhg commit \-\-amend\fP\: on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11328
+\fBchangeset.commit.amend.merge\fP for \fBhg commit \-\-amend\fP on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11329
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11330
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11331
-\fBchangeset.commit.amend.normal\fP for \%\fBhg commit \-\-amend\fP\: on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11332
+\fBchangeset.commit.amend.normal\fP for \fBhg commit \-\-amend\fP on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11333
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11334
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11335
-\fBchangeset.commit.normal.merge\fP for \%\fBhg commit\fP\: on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11336
+\fBchangeset.commit.normal.merge\fP for \fBhg commit\fP on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11337
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11338
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11339
-\fBchangeset.commit.normal.normal\fP for \%\fBhg commit\fP\: on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11340
+\fBchangeset.commit.normal.normal\fP for \fBhg commit\fP on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11341
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11342
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11343
-\fBchangeset.fetch\fP for \%\fBhg fetch\fP\: (impling merge commit)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11344
+\fBchangeset.fetch\fP for \fBhg fetch\fP (impling merge commit)
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11345
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11346
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11347
-\fBchangeset.gpg.sign\fP for \%\fBhg sign\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11348
+\fBchangeset.gpg.sign\fP for \fBhg sign\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11349
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11350
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11351
-\fBchangeset.graft\fP for \%\fBhg graft\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11352
+\fBchangeset.graft\fP for \fBhg graft\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11353
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11354
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11355
-\fBchangeset.histedit.edit\fP for \fBedit\fP of \%\fBhg histedit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11356
+\fBchangeset.histedit.edit\fP for \fBedit\fP of \fBhg histedit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11357
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11358
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11359
-\fBchangeset.histedit.fold\fP for \fBfold\fP of \%\fBhg histedit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11360
+\fBchangeset.histedit.fold\fP for \fBfold\fP of \fBhg histedit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11361
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11362
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11363
-\fBchangeset.histedit.mess\fP for \fBmess\fP of \%\fBhg histedit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11364
+\fBchangeset.histedit.mess\fP for \fBmess\fP of \fBhg histedit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11365
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11366
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11367
-\fBchangeset.histedit.pick\fP for \fBpick\fP of \%\fBhg histedit\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11368
+\fBchangeset.histedit.pick\fP for \fBpick\fP of \fBhg histedit\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11369
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11370
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11371
-\fBchangeset.import.bypass\fP for \%\fBhg import \-\-bypass\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11372
+\fBchangeset.import.bypass\fP for \fBhg import \-\-bypass\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11373
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11374
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11375
-\fBchangeset.import.normal.merge\fP for \%\fBhg import\fP\: on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11376
+\fBchangeset.import.normal.merge\fP for \fBhg import\fP on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11377
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11378
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11379
-\fBchangeset.import.normal.normal\fP for \%\fBhg import\fP\: on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11380
+\fBchangeset.import.normal.normal\fP for \fBhg import\fP on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11381
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11382
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11383
-\fBchangeset.mq.qnew\fP for \%\fBhg qnew\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11384
+\fBchangeset.mq.qnew\fP for \fBhg qnew\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11385
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11386
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11387
-\fBchangeset.mq.qfold\fP for \%\fBhg qfold\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11388
+\fBchangeset.mq.qfold\fP for \fBhg qfold\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11389
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11390
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11391
-\fBchangeset.mq.qrefresh\fP for \%\fBhg qrefresh\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11392
+\fBchangeset.mq.qrefresh\fP for \fBhg qrefresh\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11393
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11394
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11395
-\fBchangeset.rebase.collapse\fP for \%\fBhg rebase \-\-collapse\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11396
+\fBchangeset.rebase.collapse\fP for \fBhg rebase \-\-collapse\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11397
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11398
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11399
-\fBchangeset.rebase.merge\fP for \%\fBhg rebase\fP\: on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11400
+\fBchangeset.rebase.merge\fP for \fBhg rebase\fP on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11401
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11402
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11403
-\fBchangeset.rebase.normal\fP for \%\fBhg rebase\fP\: on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11404
+\fBchangeset.rebase.normal\fP for \fBhg rebase\fP on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11405
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11406
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11407
-\fBchangeset.shelve.shelve\fP for \%\fBhg shelve\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11408
+\fBchangeset.shelve.shelve\fP for \fBhg shelve\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11409
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11410
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11411
-\fBchangeset.tag.add\fP for \%\fBhg tag\fP\: without \fB\-\-remove\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11412
+\fBchangeset.tag.add\fP for \fBhg tag\fP without \fB\-\-remove\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11413
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11414
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11415
-\fBchangeset.tag.remove\fP for \%\fBhg tag \-\-remove\fP\:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11416
+\fBchangeset.tag.remove\fP for \fBhg tag \-\-remove\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11417
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11418
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11419
-\fBchangeset.transplant.merge\fP for \%\fBhg transplant\fP\: on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11420
+\fBchangeset.transplant.merge\fP for \fBhg transplant\fP on merges
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11421
 .IP \(bu 2
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11422
 .
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11423
-\fBchangeset.transplant.normal\fP for \%\fBhg transplant\fP\: on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11424
-.UNINDENT
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11425
+\fBchangeset.transplant.normal\fP for \fBhg transplant\fP on other
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11426
+.RE
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11427
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11428
 These dot\-separated lists of names are treated as hierarchical ones.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11429
 For example, \fBchangeset.tag.remove\fP customizes the commit message
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11430
-only for \%\fBhg tag \-\-remove\fP\:, but \fBchangeset.tag\fP customizes the
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11431
-commit message for \%\fBhg tag\fP\: regardless of \fB\-\-remove\fP option.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11432
+only for \fBhg tag \-\-remove\fP, but \fBchangeset.tag\fP customizes the
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11433
+commit message for \fBhg tag\fP regardless of \fB\-\-remove\fP option.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11434
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11435
 When the external editor is invoked for a commit, the corresponding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11436
 dot\-separated list of names without the \fBchangeset.\fP prefix
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11437
@@ -696,7 +599,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11438
 below can be referred as \fB{listupfiles}\fP:
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11439
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11440
 .nf
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11441
-.ft C
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11442
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11443
 [committemplate]
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11444
 listupfiles = {file_adds %
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11445
    "HG: added {file}\en"     }{file_mods %
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11446
@@ -703,7 +606,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11447
    "HG: changed {file}\en"   }{file_dels %
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11448
    "HG: removed {file}\en"   }{if(files, "",
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11449
    "HG: no files changed\en")}
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11450
-.ft P
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11451
+.ft
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11452
 .fi
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11453
 .SS \fBdecode/encode\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11454
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11455
@@ -727,7 +630,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11456
 Pipe example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11457
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11458
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11459
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11460
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11461
 [encode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11462
 # 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
 11463
 # note: not necessarily a good idea, just an example
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11464
@@ -735,9 +638,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11465
 
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11466
 [decode]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11467
 # 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
 11468
-# 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
 11469
+# 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
 11470
 *.gz = gzip
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11471
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11472
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11473
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11474
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11475
 A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11476
@@ -745,12 +648,6 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11477
 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
 11478
 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
 11479
 the command.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11480
-.IP Note
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11481
-.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11482
-The tempfile mechanism is recommended for Windows systems,
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11483
-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
 11484
-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
 11485
-.RE
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11486
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11487
 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
 11488
 translate line ending characters between Windows (CRLF) and Unix (LF)
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11489
@@ -757,20 +654,20 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11490
 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
 11491
 .SS \fBdefaults\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11492
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11493
-(defaults are deprecated. Don\(aqt use them. Use aliases instead.)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11494
+(defaults are deprecated. Don't use them. Use aliases instead.)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11495
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11496
 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
 11497
 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
 11498
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11499
-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
 11500
-\%\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
 11501
+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
 11502
+\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
 11503
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11504
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11505
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11506
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11507
 [defaults]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11508
 log = \-v
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11509
 status = \-m
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11510
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11511
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11512
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11513
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11514
 The actual commands, instead of their aliases, must be used when
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11515
@@ -779,9 +676,9 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11516
 .SS \fBdiff\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11517
 .sp
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11518
 Settings used when displaying diffs. Everything except for \fBunified\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11519
-is a Boolean and defaults to False. See \%\fBhg help config.annotate\fP\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11520
+is a Boolean and defaults to False. See \fBhg help config.annotate\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11521
 for related options for the annotate command.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11522
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11523
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11524
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11525
 .B \fBgit\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11526
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11527
@@ -793,11 +690,11 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11528
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11529
 .B \fBnodates\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11530
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11531
-Don\(aqt include dates in diff headers.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11532
+Don't include dates in diff headers.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11533
 .TP
4263
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 11534
 .B \fBnoprefix\fP
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 11535
 .sp
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 11536
-Omit \(aqa/\(aq and \(aqb/\(aq prefixes from filenames. Ignored in plain mode.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 11537
+Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
078df530ebdb 21029166 mercurial 3.4
Danek Duvall <danek.duvall@oracle.com>
parents: 3596
diff changeset
 11538
 .TP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11539
 .B \fBshowfunc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11540
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11541
@@ -818,11 +715,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11542
 .B \fBunified\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11543
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11544
 Number of lines of context to show.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11545
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11546
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11547
 .SS \fBemail\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11548
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11549
 Settings for extensions that send email messages.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11550
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11551
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11552
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11553
 .B \fBfrom\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11554
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11555
@@ -831,16 +728,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11556
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11557
 .B \fBto\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11558
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11559
-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
 11560
+Optional. Comma\-separated list of recipients' email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11561
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11562
 .B \fBcc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11563
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11564
-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
 11565
+Optional. Comma\-separated list of carbon copy recipients'
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11566
 email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11567
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11568
 .B \fBbcc\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11569
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11570
-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
 11571
+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
 11572
 email addresses.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11573
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11574
 .B \fBmethod\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11575
@@ -860,10 +757,10 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11576
 first character set to which conversion from local encoding
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11577
 (\fB$HGENCODING\fP, \fBui.fallbackencoding\fP) succeeds. If correct
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11578
 conversion fails, the text in question is sent as is.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11579
-(default: \(aq\(aq)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11580
+(default: '')
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11581
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11582
 Order of outgoing email character sets:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11583
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11584
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11585
 .IP 1. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11586
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11587
 \fBus\-ascii\fP: always first, regardless of settings
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11588
@@ -879,13 +776,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11589
 .IP 5. 3
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11590
 .
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11591
 \fButf\-8\fP: always last, regardless of settings
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11592
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11593
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11594
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11595
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11596
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11597
 Email example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11598
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11599
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11600
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11601
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11602
 [email]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11603
 from = Joseph User <[email protected]>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11604
 method = /usr/sbin/sendmail
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11605
@@ -892,7 +789,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11606
 # charsets for western Europeans
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11607
 # 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
 11608
 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
 11609
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11610
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11611
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11612
 .SS \fBextensions\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11613
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11614
@@ -899,7 +796,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11615
 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
 11616
 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
 11617
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11618
-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
 11619
+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
 11620
 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
 11621
 after the \fB=\fP.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11622
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11623
@@ -914,16 +811,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11624
 Example for \fB~/.hgrc\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11625
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11626
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11627
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11628
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11629
 [extensions]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11630
-# (the color extension will get loaded from Mercurial\(aqs path)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11631
+# (the color extension will get loaded from Mercurial's path)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11632
 color =
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11633
 # (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
 11634
 myfeature = ~/.hgext/myfeature.py
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11635
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11636
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11637
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11638
 .SS \fBformat\fP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11639
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11640
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11641
 .TP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11642
 .B \fBusegeneraldelta\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11643
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11644
@@ -968,7 +865,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11645
 Repositories with this on\-disk format require Mercurial version 0.9.4.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11646
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11647
 Enabled by default.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11648
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11649
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11650
 .SS \fBgraph\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11651
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11652
 Web graph view configuration. This section let you change graph
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11653
@@ -978,9 +875,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11654
 Each line has the following format:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11655
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11656
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11657
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11658
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11659
 <branch>.<argument> = <value>
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11660
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11661
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11662
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11663
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11664
 where \fB<branch>\fP is the name of the branch being
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11665
@@ -987,17 +884,17 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11666
 customized. Example:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11667
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11668
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11669
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11670
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11671
 [graph]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11672
 # 2px width
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11673
 default.width = 2
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11674
 # red color
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11675
 default.color = FF0000
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11676
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11677
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11678
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11679
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11680
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11681
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11682
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11683
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11684
 .B \fBwidth\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11685
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11686
@@ -1006,7 +903,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11687
 .B \fBcolor\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11688
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11689
 Set branch edges color in hexadecimal RGB notation.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11690
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11691
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11692
 .SS \fBhooks\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11693
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11694
 Commands or Python functions that get automatically executed by
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11695
@@ -1020,7 +917,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11696
 Example \fB.hg/hgrc\fP:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11697
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11698
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11699
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11700
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11701
 [hooks]
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11702
 # update working directory after adding changesets
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11703
 changegroup.update = hg update
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11704
@@ -1030,13 +927,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11705
 incoming.autobuild = /my/build/hook
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11706
 # 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
 11707
 priority.incoming.autobuild = 1
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11708
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11709
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11710
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11711
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11712
 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
 11713
 additional information. For each hook below, the environment
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11714
 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
 11715
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11716
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11717
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11718
 .B \fBchangegroup\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11719
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11720
@@ -1060,7 +957,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11721
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11722
 Run after sending changes from local repository to another. ID of
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11723
 first changeset sent is in \fB$HG_NODE\fP. Source of operation is in
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11724
-\fB$HG_SOURCE\fP; Also see \%\fBhg help config.preoutgoing\fP\: hook.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11725
+\fB$HG_SOURCE\fP; Also see \fBhg help config.preoutgoing\fP hook.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11726
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11727
 .B \fBpost\-<command>\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11728
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11729
@@ -1080,7 +977,7 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11730
 representations of the data internally passed to <command>. \fB$HG_OPTS\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11731
 is a dictionary of options (with unspecified options set to their
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11732
 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
 11733
-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
 11734
+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
 11735
 code.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11736
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11737
 .B \fBprechangegroup\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11738
@@ -1152,12 +1049,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11739
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11740
 Run after any repository transaction has been committed. At this
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11741
 point, the transaction can no longer be rolled back. The hook will run
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11742
-after the lock is released. See \%\fBhg help config.pretxnclose\fP\: docs for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11743
+after the lock is released. See \fBhg help config.pretxnclose\fP docs for
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11744
 details about available variables.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11745
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11746
 .B \fBtxnabort\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11747
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11748
-Run when a transaction is aborted. See \%\fBhg help config.pretxnclose\fP\:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11749
+Run when a transaction is aborted. See \fBhg help config.pretxnclose\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11750
 docs for details about available variables.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11751
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11752
 .B \fBpretxnchangegroup\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11753
@@ -1211,7 +1108,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11754
 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
 11755
 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
 11756
 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
 11757
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11758
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11759
 .IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11760
 .
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11761
 It is generally better to use standard hooks rather than the
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11762
@@ -1220,21 +1117,14 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11763
 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
 11764
 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
 11765
 .RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11766
-.IP Note
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11767
-.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11768
-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
 11769
-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
 11770
-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
 11771
-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
 11772
-.RE
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11773
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11774
 The syntax for Python hooks is as follows:
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11775
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11776
 .nf
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11777
-.ft C
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11778
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11779
 hookname = python:modulename.submodule.callable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11780
 hookname = python:/path/to/python/module.py:callable
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11781
-.ft P
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11782
+.ft
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11783
 .fi
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11784
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11785
 Python hooks are run within the Mercurial process. Each hook is
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11786
@@ -1258,10 +1148,10 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11787
 For example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11788
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11789
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11790
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11791
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11792
 [hostfingerprints]
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 11793
 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
 11794
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11795
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11796
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11797
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11798
 This feature is only supported when using Python 2.6 or later.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11799
@@ -1269,7 +1159,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11800
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11801
 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
 11802
 proxy.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11803
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11804
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11805
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11806
 .B \fBhost\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11807
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11808
@@ -1293,7 +1183,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11809
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11810
 Optional. Always use the proxy, even for localhost and any entries
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11811
 in \fBhttp_proxy.no\fP. (default: False)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11812
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11813
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11814
 .SS \fBmerge\-patterns\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11815
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11816
 This section specifies merge tools to associate with particular file
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11817
@@ -1304,23 +1194,23 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11818
 Example:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11819
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11820
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11821
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11822
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11823
 [merge\-patterns]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11824
 **.c = kdiff3
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11825
 **.jpg = myimgmerge
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11826
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11827
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11828
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11829
 .SS \fBmerge\-tools\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11830
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11831
 This section configures external merge tools to use for file\-level
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11832
 merges. This section has likely been preconfigured at install time.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11833
-Use \%\fBhg config merge\-tools\fP\: to check the existing configuration.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11834
-Also see \%\fBhg help merge\-tools\fP\: for more details.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11835
+Use \fBhg config merge\-tools\fP to check the existing configuration.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11836
+Also see \fBhg help merge\-tools\fP for more details.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11837
 .sp
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11838
 Example \fB~/.hgrc\fP:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11839
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11840
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11841
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11842
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11843
 [merge\-tools]
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11844
 # Override stock tool location
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11845
 kdiff3.executable = ~/bin/kdiff3
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11846
@@ -1337,13 +1227,12 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11847
 
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11848
 # Define new tool
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11849
 myHtmlTool.args = \-m $local $other $base $output
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11850
-myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11851
 myHtmlTool.priority = 1
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11852
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11853
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11854
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11855
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11856
 Supported arguments:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11857
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11858
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11859
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11860
 .B \fBpriority\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11861
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11862
@@ -1354,9 +1243,6 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11863
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11864
 Either just the name of the executable or its pathname.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11865
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11866
-On Windows, the path can use environment variables with ${ProgramFiles}
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11867
-syntax.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11868
-.sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11869
 (default: the tool name)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11870
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11871
 .B \fBargs\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11872
@@ -1379,7 +1265,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11873
 \fBkeep\-merge3\fP. The \fBkeep\fP option will leave markers in the file if the
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11874
 premerge fails. The \fBkeep\-merge3\fP will do the same but include information
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11875
 about the base of the merge in the marker (see internal :merge3 in
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11876
-\%\fBhg help merge\-tools\fP\:).
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11877
+\fBhg help merge\-tools\fP).
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11878
 (default: True)
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11879
 .TP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 11880
 .B \fBbinary\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11881
@@ -1394,7 +1280,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11882
 .B \fBcheck\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11883
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11884
 A list of merge success\-checking options:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11885
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11886
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11887
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11888
 .B \fBchanged\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11889
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11890
@@ -1407,7 +1293,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11891
 .B \fBprompt\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11892
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11893
 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
 11894
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11895
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11896
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11897
 .B \fBfixeol\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11898
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11899
@@ -1417,44 +1303,16 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11900
 .B \fBgui\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11901
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11902
 This tool requires a graphical interface to run. (default: False)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11903
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11904
-.INDENT 0.0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11905
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11906
-.B \fBregkey\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11907
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11908
-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
 11909
-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
 11910
-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11911
-(default: None)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11912
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11913
-.B \fBregkeyalt\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11914
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11915
-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
 11916
-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
 11917
-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
 11918
-is to search for 32bit applications on 64bit operating systems.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11919
-(default: None)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11920
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11921
-.B \fBregname\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11922
-.sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11923
-Name of value to read from specified registry key.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11924
-(default: the unnamed (default) value)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11925
-.TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11926
-.B \fBregappend\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11927
-.sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11928
-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
 11929
-the executable name of the tool.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11930
-(default: None)
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 11931
-.UNINDENT
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11932
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11933
 .SS \fBpatch\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11934
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11935
-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
 11936
+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
 11937
 command or with Mercurial Queues extension.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11938
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11939
+.RS 0
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11940
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11941
 .B \fBeol\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11942
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 11943
-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
 11944
+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
 11945
 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
 11946
 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
 11947
 normalized to either LF (Unix) or CRLF (Windows). When set to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11948
@@ -1466,11 +1324,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11949
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11950
 .B \fBfuzz\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11951
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11952
-The number of lines of \(aqfuzz\(aq to allow when applying patches. This
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11953
+The number of lines of 'fuzz' to allow when applying patches. This
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11954
 controls how much context the patcher is allowed to ignore when
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11955
 trying to apply a patch.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11956
 (default: 2)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11957
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11958
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11959
 .SS \fBpaths\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11960
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11961
 Assigns symbolic names and behavior to repositories.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11962
@@ -1479,57 +1337,57 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11963
 location of the repository. Example:
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11964
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11965
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11966
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11967
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 11968
 [paths]
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11969
 my_server = https://example.com/my_repo
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11970
 local_path = /home/me/repo
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11971
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11972
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11973
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11974
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11975
 These symbolic names can be used from the command line. To pull
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11976
-from \fBmy_server\fP: \%\fBhg pull my_server\fP\:. To push to \fBlocal_path\fP:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11977
-\%\fBhg push local_path\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11978
+from \fBmy_server\fP: \fBhg pull my_server\fP. To push to \fBlocal_path\fP:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11979
+\fBhg push local_path\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11980
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11981
 Options containing colons (\fB:\fP) denote sub\-options that can influence
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11982
 behavior for that specific path. Example:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11983
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11984
 .nf
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11985
-.ft C
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11986
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11987
 [paths]
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11988
 my_server = https://example.com/my_path
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11989
 my_server:pushurl = ssh://example.com/my_path
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11990
-.ft P
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11991
+.ft
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11992
 .fi
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11993
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11994
 The following sub\-options can be defined:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11995
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11996
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11997
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11998
 .B \fBpushurl\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 11999
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12000
 The URL to use for push operations. If not defined, the location
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12001
-defined by the path\(aqs main entry is used.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12002
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12003
+defined by the path's main entry is used.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12004
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12005
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12006
 The following special named paths exist:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12007
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12008
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12009
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12010
 .B \fBdefault\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12011
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12012
 The URL or directory to use when no source or remote is specified.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12013
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12014
-\%\fBhg clone\fP\: will automatically define this path to the location the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12015
+\fBhg clone\fP will automatically define this path to the location the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12016
 repository was cloned from.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12017
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12018
 .B \fBdefault\-push\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12019
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12020
-(deprecated) The URL or directory for the default \%\fBhg push\fP\: location.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12021
+(deprecated) The URL or directory for the default \fBhg push\fP location.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12022
 \fBdefault:pushurl\fP should be used instead.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12023
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12024
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12025
 .SS \fBphases\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12026
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12027
-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
 12028
+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
 12029
 information about working with phases.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12030
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12031
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12032
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12033
 .B \fBpublish\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12034
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12035
@@ -1554,7 +1412,7 @@
1981
66b174f4707e 19144423 mercurial 3.0.1
Danek Duvall <danek.duvall@oracle.com>
parents: 1637
diff changeset
 12036
 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
 12037
 used for the parent repository commit (if set to "follow").
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12038
 (default: follow)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12039
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12040
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12041
 .SS \fBprofiling\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12042
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12043
 Specifies profiling type, format, and file output. Two profilers are
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12044
@@ -1561,21 +1419,21 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12045
 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
 12046
 profiler (named \fBstat\fP).
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12047
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12048
-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
 12049
-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
 12050
+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
 12051
+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
 12052
 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
 12053
 profiling is done using lsprof.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12054
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12055
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12056
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12057
 .B \fBtype\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12058
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12059
 The type of profiler to use.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12060
 (default: ls)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12061
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12062
+.RS 7
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12063
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12064
 .B \fBls\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12065
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12066
-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
 12067
+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
 12068
 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
 12069
 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
 12070
 identify the expensive parts of a non\-trivial function.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12071
@@ -1585,13 +1443,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12072
 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
 12073
 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
 12074
 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
 12075
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12076
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12077
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12078
 .B \fBformat\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12079
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12080
 Profiling format.  Specific to the \fBls\fP instrumenting profiler.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12081
 (default: text)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12082
-.INDENT 7.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12083
+.RS 7
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12084
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12085
 .B \fBtext\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12086
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12087
@@ -1604,7 +1462,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12088
 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
 12089
 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
 12090
 kcachegrind.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12091
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12092
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12093
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12094
 .B \fBfrequency\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12095
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12096
@@ -1635,13 +1493,13 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12097
 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
 12098
 Specific to the \fBls\fP instrumenting profiler.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12099
 (default: 5)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12100
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12101
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12102
 .SS \fBprogress\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12103
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12104
 Mercurial commands can draw progress bars that are as informative as
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12105
 possible. Some progress bars only offer indeterminate information, while others
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12106
 have a definite end point.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12107
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12108
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12109
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12110
 .B \fBdelay\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12111
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12112
@@ -1675,31 +1533,31 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12113
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12114
 .B \fBclear\-complete\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12115
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12116
-Clear the progress bar after it\(aqs done. (default: True)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12117
+Clear the progress bar after it's done. (default: True)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12118
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12119
 .B \fBdisable\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12120
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12121
-If true, don\(aqt show a progress bar.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12122
+If true, don't show a progress bar.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12123
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12124
 .B \fBassume\-tty\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12125
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12126
 If true, ALWAYS show a progress bar, unless disable is given.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12127
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12128
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12129
 .SS \fBrebase\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12130
-.INDENT 0.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12131
+.RS 0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12132
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12133
 .B \fBallowdivergence\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12134
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12135
 Default to False, when True allow creating divergence when performing
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12136
 rebase of obsolete changesets.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12137
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12138
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12139
 .SS \fBrevsetalias\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12140
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12141
-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
 12142
+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
 12143
 .SS \fBserver\fP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12144
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12145
 Controls generic server settings.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12146
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12147
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12148
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12149
 .B \fBuncompressed\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12150
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12151
@@ -1764,11 +1622,11 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12152
 consider setting this option because converting \fIgeneraldelta\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12153
 repositories to the exchange format required by the bundle1 data
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12154
 format can consume a lot of CPU.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12155
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12156
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12157
 .SS \fBsmtp\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12158
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12159
 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
 12160
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12161
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12162
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12163
 .B \fBhost\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12164
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12165
@@ -1793,7 +1651,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12166
 \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
 12167
 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
 12168
 \fB[hostfingerprints]\fP and \fB[web] cacerts\fP.  \-\-insecure for
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12169
-\%\fBhg email\fP\: overwrites this as "loose". (default: strict)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12170
+\fBhg email\fP overwrites this as "loose". (default: strict)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12171
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12172
 .B \fBusername\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12173
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12174
@@ -1810,7 +1668,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12175
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12176
 Optional. The hostname that the sender can use to identify
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12177
 itself to the MTA.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12178
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12179
+.RE
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12180
 .SS \fBsubpaths\fP
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12181
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12182
 Subrepository source URLs can go stale if a remote server changes name
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12183
@@ -1818,9 +1676,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12184
 rewrite rules of the form:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12185
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12186
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12187
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12188
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12189
 <pattern> = <replacement>
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12190
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12191
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12192
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12193
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12194
 where \fBpattern\fP is a regular expression matching a subrepository
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12195
@@ -1829,9 +1687,9 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12196
 \fBreplacements\fP. For instance:
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12197
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12198
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12199
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12200
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12201
 http://server/(.*)\-hg/ = http://hg.server/\e1/
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12202
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12203
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12204
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12205
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12206
 rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12207
@@ -1842,7 +1700,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12208
 .SS \fBtrusted\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12209
 .sp
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12210
 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
 12211
-\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
 12212
+\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
 12213
 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
 12214
 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
 12215
 hooks or extensions for shared repositories or servers. However,
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12216
@@ -1854,7 +1712,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12217
 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
 12218
 \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
 12219
 user or service running Mercurial.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12220
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12221
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12222
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12223
 .B \fBusers\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12224
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12225
@@ -1863,17 +1721,17 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12226
 .B \fBgroups\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12227
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12228
 Comma\-separated list of trusted groups.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12229
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12230
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12231
 .SS \fBui\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12232
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12233
 User interface controls.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12234
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12235
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12236
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12237
 .B \fBarchivemeta\fP
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12238
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12239
 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
 12240
 (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
 12241
-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
 12242
+by the \fBhg archive\fP command or downloaded via hgweb.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12243
 (default: True)
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12244
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12245
 .B \fBaskusername\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12246
@@ -1888,7 +1746,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12247
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12248
 Whether the "clone bundles" feature is enabled.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12249
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12250
-When enabled, \%\fBhg clone\fP\: may download and apply a server\-advertised
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12251
+When enabled, \fBhg clone\fP may download and apply a server\-advertised
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12252
 bundle file from a URL instead of using the normal exchange mechanism.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12253
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12254
 This can likely result in faster and more reliable clones.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12255
@@ -1906,7 +1764,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12256
 clone, this would add significant and unexpected load to the server
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12257
 since the server is expecting clone operations to be offloaded to
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12258
 pre\-generated bundles. Failing fast (the default behavior) ensures
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12259
-clients don\(aqt overwhelm the server when "clone bundle" application
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12260
+clients don't overwhelm the server when "clone bundle" application
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12261
 fails.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12262
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12263
 (default: False)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12264
@@ -1921,17 +1779,17 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12265
 bundle over another.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12266
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12267
 The following keys are defined by Mercurial:
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12268
-.INDENT 7.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12269
+.RS 7
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12270
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12271
 .B BUNDLESPEC
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12272
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12273
-A bundle type specifier. These are strings passed to \%\fBhg bundle \-t\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12274
+A bundle type specifier. These are strings passed to \fBhg bundle \-t\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12275
 e.g. \fBgzip\-v2\fP or \fBbzip2\-v1\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12276
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12277
 .B COMPRESSION
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12278
 .
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12279
 The compression format of the bundle. e.g. \fBgzip\fP and \fBbzip2\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12280
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12281
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12282
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12283
 Server operators may define custom keys.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12284
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12285
@@ -1957,7 +1815,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12286
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12287
 .B \fBfallbackencoding\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12288
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12289
-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
 12290
+Encoding to try if it's not possible to decode the changelog using
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12291
 UTF\-8. (default: ISO\-8859\-1)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12292
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12293
 .B \fBgraphnodetemplate\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12294
@@ -1985,7 +1843,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12295
 .B \fBmerge\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12296
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12297
 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
 12298
-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
 12299
+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
 12300
 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
 12301
 .TP
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12302
 .B \fBmergemarkers\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12303
@@ -1992,7 +1850,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12304
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12305
 Sets the merge conflict marker label styling. The \fBdetailed\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12306
 style uses the \fBmergemarkertemplate\fP setting to style the labels.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12307
-The \fBbasic\fP style just uses \(aqlocal\(aq and \(aqother\(aq as the marker label.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12308
+The \fBbasic\fP style just uses 'local' and 'other' as the marker label.
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12309
 One of \fBbasic\fP or \fBdetailed\fP.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12310
 (default: \fBbasic\fP)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12311
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12312
@@ -1999,7 +1857,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12313
 .B \fBmergemarkertemplate\fP
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12314
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12315
 The template used to print the commit description next to each conflict
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12316
-marker during merge conflicts. See \%\fBhg help templates\fP\: for the template
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12317
+marker during merge conflicts. See \fBhg help templates\fP for the template
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12318
 format.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12319
 .sp
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12320
 Defaults to showing the hash, tags, branches, bookmarks, author, and
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12321
@@ -2036,12 +1894,12 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12322
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12323
 Check for portable filenames. Can be \fBwarn\fP, \fBignore\fP or \fBabort\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12324
 (default: \fBwarn\fP)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12325
-.INDENT 7.0
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12326
+.RS 7
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12327
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12328
 .B \fBwarn\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12329
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12330
 Print a warning message on POSIX platforms, if a file with a non\-portable
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12331
-filename is added (e.g. a file with a name that can\(aqt be created on
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12332
+filename is added (e.g. a file with a name that can't be created on
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12333
 Windows because it contains reserved parts like \fBAUX\fP, reserved
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12334
 characters like \fB:\fP, or would cause a case collision with an existing
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12335
 file).
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12336
@@ -2048,7 +1906,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12337
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12338
 .B \fBignore\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12339
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12340
-Don\(aqt print a warning.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12341
+Don't print a warning.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12342
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12343
 .B \fBabort\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12344
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12345
@@ -2061,9 +1919,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12346
 .B \fBfalse\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12347
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12348
 Alias for \fBignore\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12349
-.UNINDENT
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12350
-.sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12351
-On Windows, this configuration option is ignored and the command aborted.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12352
+.RE
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12353
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12354
 .B \fBquiet\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12355
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12356
@@ -2127,7 +1983,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12357
 .B \fBusername\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12358
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12359
 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
 12360
-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
 12361
+Typically a person's name and email address, e.g. \fBFred Widget
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12362
 <[email protected]>\fP. Environment variables in the
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12363
 username are expanded.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12364
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12365
@@ -2139,11 +1995,11 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12366
 .B \fBverbose\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12367
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12368
 Increase the amount of output printed. (default: False)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12369
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12370
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12371
 .SS \fBweb\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12372
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12373
 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
 12374
-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
 12375
+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
 12376
 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
 12377
 and WSGI).
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12378
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12379
@@ -2159,9 +2015,9 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12380
 command line:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12381
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12382
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12383
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12384
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12385
 $ 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
 12386
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12387
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12388
 .fi
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12389
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12390
 Note that this will allow anybody to push anything to the server and
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12391
@@ -2168,7 +2024,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12392
 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
 12393
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12394
 The full set of options is:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12395
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12396
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12397
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12398
 .B \fBaccesslog\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12399
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12400
@@ -2253,13 +2109,13 @@
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12401
 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
 12402
 command line.
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12403
 .sp
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12404
-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
 12405
+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
 12406
 one. On most Linux systems this will be
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12407
 \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
 12408
 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
 12409
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12410
 .nf
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12411
-.ft C
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12412
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12413
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12414
 \&... (certificate in base64 PEM encoding) ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12415
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12416
@@ -2266,7 +2122,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12417
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12418
 \&... (certificate in base64 PEM encoding) ...
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12419
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12420
-.ft P
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12421
+.ft
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12422
 .fi
821
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12423
 .TP
5450c885c205 7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents: 400
diff changeset
 12424
 .B \fBcache\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12425
@@ -2275,7 +2131,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12426
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12427
 .B \fBcertificate\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12428
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12429
-Certificate to use when running \%\fBhg serve\fP\:.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12430
+Certificate to use when running \fBhg serve\fP.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12431
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12432
 .B \fBcollapse\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12433
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12434
@@ -2332,7 +2188,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12435
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12436
 .B \fBdescription\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12437
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12438
-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
 12439
+Textual description of the repository's purpose or contents.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12440
 (default: "unknown")
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12441
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12442
 .B \fBencoding\fP
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12443
@@ -2397,7 +2253,7 @@
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12444
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12445
 .B \fBprefix\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12446
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12447
-Prefix path to serve from. (default: \(aq\(aq (server root))
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12448
+Prefix path to serve from. (default: '' (server root))
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12449
 .TP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12450
 .B \fBpush_ssl\fP
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12451
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12452
@@ -2436,7 +2292,7 @@
3596
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12453
 .sp
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12454
 Where to find the HTML templates. The default path to the HTML templates
042f4e7a6dbe 20246148 mercurial 3.2.3
Danek Duvall <danek.duvall@oracle.com>
parents: 1981
diff changeset
 12455
 can be obtained from \fBhg debuginstall\fP.
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12456
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12457
+.RE
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12458
 .SS \fBwebsub\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12459
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12460
 Web substitution filter definition. You can use this section to
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12461
@@ -2458,9 +2314,9 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12462
 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
 12463
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12464
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12465
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12466
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12467
 patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12468
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12469
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12470
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12471
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12472
 You can use any separator other than "/". The final "i" is optional
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12473
@@ -2469,12 +2325,12 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12474
 Examples:
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12475
 .sp
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12476
 .nf
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12477
-.ft C
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12478
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12479
 [websub]
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12480
 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
 12481
 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
 12482
 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
 12483
-.ft P
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12484
+.ft
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12485
 .fi
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12486
 .SS \fBworker\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12487
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12488
@@ -2481,7 +2337,7 @@
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12489
 Parallel master/worker configuration. We currently perform working
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12490
 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
 12491
 helps performance.
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12492
-.INDENT 0.0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12493
+.RS 0
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12494
 .TP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12495
 .B \fBnumcpus\fP
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12496
 .sp
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12497
@@ -2492,7 +2348,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12498
 .B \fBbackgroundclose\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12499
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12500
 Whether to enable closing file handles on background threads during certain
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12501
-operations. Some platforms aren\(aqt very efficient at closing file
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12502
+operations. Some platforms aren't very efficient at closing file
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12503
 handles that have been written or appened to. By performing file closing
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12504
 on background threads, file write rate can increase substantially.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12505
 (default: true on Windows, false elsewhere)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12506
@@ -2500,7 +2356,7 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12507
 .B \fBbackgroundcloseminfilecount\fP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12508
 .sp
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12509
 Minimum number of files required to trigger background file closing.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12510
-Operations not writing this many files won\(aqt start background close
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12511
+Operations not writing this many files won't start background close
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12512
 threads.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12513
 (default: 2048)
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12514
 .TP
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12515
@@ -2516,18 +2372,18 @@
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12516
 Number of threads to process background file closes. Only relevant if
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12517
 \fBbackgroundclose\fP is enabled.
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12518
 (default: 4)
1637
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12519
-.UNINDENT
54bd5ac8db85 18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 821
diff changeset
 12520
+.RE
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12521
 .SH AUTHOR
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12522
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12523
-Bryan O\(aqSullivan <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12524
+Bryan O'Sullivan <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12525
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12526
-Mercurial was written by Matt Mackall <\%[email protected]\:>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12527
+Mercurial was written by Matt Mackall <[email protected]>.
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12528
 .SH SEE ALSO
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12529
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12530
-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\:
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12531
+\fBhg\fP(1), \fBhgignore\fP(5)
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12532
 .SH COPYING
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12533
 .sp
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12534
-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
 12535
+This manual page is copyright 2005 Bryan O'Sullivan.
5481
5e30cd0645e7 21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents: 4263
diff changeset
 12536
 Mercurial is copyright 2005\-2016 Matt Mackall.
196
816e398e992c 6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents: 181
diff changeset
 12537
 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
 12538
 Public License version 2 or any later version.