author | Danek Duvall <danek.duvall@oracle.com> |
Mon, 13 Jan 2014 12:44:59 -0800 | |
changeset 1637 | 54bd5ac8db85 |
parent 821 | 5450c885c205 |
child 1981 | 66b174f4707e |
child 3748 | 4e3605a7e3c0 |
permissions | -rw-r--r-- |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1 |
--- mercurial-2.8.2/doc/hg.1 Wed Jan 1 19:46:47 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2 |
+++ mercurial-2.8.2/doc/hg.1 Tue Jan 7 15:28:46 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3 |
@@ -3,33 +3,6 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4 |
.TH HG 1 "" "" "Mercurial Manual" |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5 |
.SH NAME |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6 |
hg \- Mercurial source code management system |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8 |
-.nr rst2man-indent-level 0 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
10 |
-.de1 rstReportMargin |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
11 |
-\\$1 \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
12 |
-level \\n[rst2man-indent-level] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
13 |
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
14 |
-- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
15 |
-\\n[rst2man-indent0] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
16 |
-\\n[rst2man-indent1] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
17 |
-\\n[rst2man-indent2] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
18 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
19 |
-.de1 INDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
20 |
-.\" .rstReportMargin pre: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
21 |
-. RS \\$1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
22 |
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
23 |
-. nr rst2man-indent-level +1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
24 |
-.\" .rstReportMargin post: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
25 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
26 |
-.de UNINDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
27 |
-. RE |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
28 |
-.\" indent \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
29 |
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
30 |
-.nr rst2man-indent-level -1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
31 |
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
32 |
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
33 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
34 |
.SH SYNOPSIS |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
35 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
36 |
\fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]... |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
37 |
@@ -38,12 +11,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
38 |
The \fBhg\fP command provides a command line interface to the Mercurial |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
39 |
system. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
40 |
.SH COMMAND ELEMENTS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
41 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
42 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
43 |
.TP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
44 |
.B files... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
45 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
46 |
indicates one or more filename or relative path filenames; see |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
47 |
-\%File Name Patterns\: for information on pattern matching |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
48 |
+File Name Patterns for information on pattern matching |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
49 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
50 |
.B path |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
51 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
52 |
@@ -59,9 +32,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
53 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
54 |
either the pathname of a local repository or the URI of a remote |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
55 |
repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
56 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
57 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
58 |
.SH OPTIONS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
59 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
60 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
61 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
62 |
.B \-R, \-\-repository |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
63 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
64 |
@@ -85,7 +58,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
65 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
66 |
.B \-\-config |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
67 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
68 |
-set/override config option (use \(aqsection.name=value\(aq) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
69 |
+set/override config option (use 'section.name=value') |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
70 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
71 |
.B \-\-debug |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
72 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
73 |
@@ -126,14 +99,14 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
74 |
.B \-\-hidden |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
75 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
76 |
consider hidden changesets |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
77 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
78 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
79 |
.SH COMMANDS |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
80 |
.SS add |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
81 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
82 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
83 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
84 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
85 |
hg add [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
86 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
87 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
88 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
89 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
90 |
Schedule files to be version controlled and added to the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
91 |
@@ -140,15 +113,15 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
92 |
repository. |
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 |
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
|
95 |
-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
|
96 |
+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
|
97 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
98 |
If no names are given, add all files to the repository. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
99 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
100 |
An example showing how new (unknown) files are added |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
101 |
-automatically by \%\fBhg add\fP\:: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
102 |
+automatically by \fBhg add\fP: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
103 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
104 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
105 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
106 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
107 |
$ ls |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
108 |
foo.c |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
109 |
$ hg status |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
110 |
@@ -157,13 +130,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
111 |
adding foo.c |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
112 |
$ hg status |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
113 |
A foo.c |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
114 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
115 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
116 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
117 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
118 |
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
|
119 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
120 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
121 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
122 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
123 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
124 |
.B \-I, \-\-include |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
125 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
126 |
@@ -180,13 +153,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
127 |
.B \-n, \-\-dry\-run |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
128 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
129 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
130 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
131 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
132 |
.SS addremove |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
133 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
134 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
135 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
136 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
137 |
hg addremove [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
138 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
139 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
140 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
141 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
142 |
Add all new files and remove all missing files from the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
143 |
@@ -193,7 +166,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
144 |
repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
145 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
146 |
New files are ignored if they match any of the patterns in |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
147 |
-\fB.hgignore\fP. As with add, these changes take effect at the next |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
148 |
+\fB\&.hgignore\fP. As with add, these changes take effect at the next |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
149 |
commit. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
150 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
151 |
Use the \-s/\-\-similarity option to detect renamed files. This |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
152 |
@@ -201,7 +174,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
153 |
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
|
154 |
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
|
155 |
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
|
156 |
-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
|
157 |
+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
|
158 |
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
|
159 |
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
|
160 |
identical files are detected. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
161 |
@@ -209,7 +182,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
162 |
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
|
163 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
164 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
165 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
166 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
167 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
168 |
.B \-s, \-\-similarity |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
169 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
170 |
@@ -226,13 +199,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
171 |
.B \-n, \-\-dry\-run |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
172 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
173 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
174 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
175 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
176 |
.SS annotate |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
177 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
178 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
179 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
180 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
181 |
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
|
182 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
183 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
184 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
185 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
186 |
List changes in files, showing the revision id responsible for |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
187 |
@@ -249,7 +222,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
188 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
189 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
190 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
191 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
192 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
193 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
194 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
195 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
196 |
@@ -261,7 +234,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
197 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
198 |
.B \-\-no\-follow |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
199 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
200 |
-don\(aqt follow copies and renames |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
201 |
+don't follow copies and renames |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
202 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
203 |
.B \-a, \-\-text |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
204 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
205 |
@@ -312,13 +285,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
206 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
207 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
208 |
aliases: blame |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
209 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
210 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
211 |
.SS archive |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
212 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
213 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
214 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
215 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
216 |
hg archive [OPTION]... DEST |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
217 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
218 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
219 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
220 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
221 |
By default, the revision used is the parent of the working |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
222 |
@@ -328,15 +301,15 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
223 |
extension (or override using \-t/\-\-type). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
224 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
225 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
226 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
227 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
228 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
229 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
230 |
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
|
231 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
232 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
233 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
234 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
235 |
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
|
236 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
237 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
238 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
239 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
240 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
241 |
@@ -343,14 +316,14 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
242 |
create a tarball excluding .hg files: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
243 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
244 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
245 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
246 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
247 |
hg archive project.tar.gz \-X ".hg*" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
248 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
249 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
250 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
251 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
252 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
253 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
254 |
Valid types are: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
255 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
256 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
257 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
258 |
.B \fBfiles\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
259 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
260 |
@@ -375,10 +348,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
261 |
.B \fBzip\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
262 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
263 |
zip archive, compressed using deflate |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
264 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
265 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
266 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
267 |
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
|
268 |
-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
|
269 |
+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
|
270 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
271 |
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
|
272 |
prepended. Use \-p/\-\-prefix to specify a format string for the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
273 |
@@ -388,7 +361,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
274 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
275 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
276 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
277 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
278 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
279 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
280 |
.B \-\-no\-decode |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
281 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
282 |
@@ -417,13 +390,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
283 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
284 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
285 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
286 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
287 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
288 |
.SS backout |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
289 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
290 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
291 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
292 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
293 |
hg backout [OPTION]... [\-r] REV |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
294 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
295 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
296 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
297 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
298 |
Prepare a new changeset with the effect of REV undone in the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
299 |
@@ -444,16 +417,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
300 |
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
|
301 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
302 |
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
|
303 |
-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
|
304 |
+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
|
305 |
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
|
306 |
merged separately. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
307 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
308 |
-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
|
309 |
+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
|
310 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
311 |
Returns 0 on success. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
312 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
313 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
314 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
315 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
316 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
317 |
.B \-\-merge |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
318 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
319 |
@@ -494,13 +467,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
320 |
.B \-u, \-\-user |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
321 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
322 |
record the specified user as committer |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
323 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
324 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
325 |
.SS bisect |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
326 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
327 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
328 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
329 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
330 |
hg bisect [\-gbsr] [\-U] [\-c CMD] [REV] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
331 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
332 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
333 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
334 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
335 |
This command helps to find changesets which introduce problems. To |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
336 |
@@ -524,16 +497,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
337 |
is bad. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
338 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
339 |
Some examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
340 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
341 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
342 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
343 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
344 |
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
|
345 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
346 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
347 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
348 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
349 |
hg bisect \-\-bad 34 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
350 |
hg bisect \-\-good 12 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
351 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
352 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
353 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
354 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
355 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
356 |
@@ -541,10 +514,10 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
357 |
bad: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
358 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
359 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
360 |
-.ft C |
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 |
hg bisect \-\-good |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
363 |
hg bisect \-\-bad |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
364 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
365 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
366 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
367 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
368 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
369 |
@@ -552,10 +525,10 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
370 |
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
|
371 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
372 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
373 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
374 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
375 |
hg bisect \-\-skip |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
376 |
hg bisect \-\-skip 23 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
377 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
378 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
379 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
380 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
381 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
382 |
@@ -562,9 +535,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
383 |
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
|
384 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
385 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
386 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
387 |
-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
|
388 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
389 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
390 |
+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
|
391 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
392 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
393 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
394 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
395 |
@@ -571,22 +544,22 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
396 |
forget the current bisection: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
397 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
398 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
399 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
400 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
401 |
hg bisect \-\-reset |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
402 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
403 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
404 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
405 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
406 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
407 |
-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
|
408 |
+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
|
409 |
revision: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
410 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
411 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
412 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
413 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
414 |
hg bisect \-\-reset |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
415 |
hg bisect \-\-bad 34 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
416 |
hg bisect \-\-good 12 |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
417 |
hg bisect \-\-command "make && make tests" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
418 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
419 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
420 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
421 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
422 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
423 |
@@ -594,9 +567,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
424 |
bisection: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
425 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
426 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
427 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
428 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
429 |
hg log \-r "bisect(pruned)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
430 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
431 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
432 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
433 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
434 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
435 |
@@ -604,9 +577,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
436 |
if running with \-U/\-\-noupdate): |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
437 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
438 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
439 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
440 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
441 |
hg log \-r "bisect(current)" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
442 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
443 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
444 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
445 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
446 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
447 |
@@ -613,9 +586,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
448 |
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
|
449 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
450 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
451 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
452 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
453 |
hg log \-r "bisect(range)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
454 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
455 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
456 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
457 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
458 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
459 |
@@ -622,18 +595,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
460 |
you can even get a nice graph: |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
461 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
462 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
463 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
464 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
465 |
hg log \-\-graph \-r "bisect(range)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
466 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
467 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
468 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
469 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
470 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
471 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
472 |
-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
|
473 |
+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
|
474 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
475 |
Returns 0 on success. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
476 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
477 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
478 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
479 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
480 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
481 |
.B \-r, \-\-reset |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
482 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
483 |
@@ -662,31 +635,31 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
484 |
.B \-U, \-\-noupdate |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
485 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
486 |
do not update to target |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
487 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
488 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
489 |
.SS bookmarks |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
490 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
491 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
492 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
493 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
494 |
hg bookmarks [OPTIONS]... [NAME]... |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
495 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
496 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
497 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
498 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
499 |
Bookmarks are pointers to certain commits that move when committing. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
500 |
Bookmarks are local. They can be renamed, copied and deleted. It is |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
501 |
-possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
502 |
-\%\fBhg update NAME\fP\: to update to a given bookmark. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
503 |
+possible to use \fBhg merge NAME\fP to merge from a given bookmark, and |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
504 |
+\fBhg update NAME\fP to update to a given bookmark. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
505 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
506 |
-You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
507 |
-directory\(aqs parent revision with the given name. If you specify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
508 |
+You can use \fBhg bookmark NAME\fP to set a bookmark on the working |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
509 |
+directory's parent revision with the given name. If you specify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
510 |
a revision using \-r REV (where REV may be an existing bookmark), |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
511 |
the bookmark is assigned to that revision. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
512 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
513 |
-Bookmarks can be pushed and pulled between repositories (see \%\fBhg help |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
514 |
-push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
515 |
+Bookmarks can be pushed and pulled between repositories (see \fBhg help |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
516 |
+push\fP and \fBhg help pull\fP). This requires both the local and remote |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
517 |
repositories to support bookmarks. For versions prior to 1.8, this means |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
518 |
the bookmarks extension must be enabled. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
519 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
520 |
-If you set a bookmark called \(aq@\(aq, new clones of the repository will |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
521 |
+If you set a bookmark called '@', new clones of the repository will |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
522 |
have that revision checked out (and the bookmark made active) by |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
523 |
default. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
524 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
525 |
@@ -696,7 +669,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
526 |
current active bookmark will be marked inactive. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
527 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
528 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
529 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
530 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
531 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
532 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
533 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
534 |
@@ -719,18 +692,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
535 |
mark a bookmark inactive |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
536 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
537 |
aliases: bookmark |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
538 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
539 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
540 |
.SS branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
541 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
542 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
543 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
544 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
545 |
hg branch [\-fC] [NAME] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
546 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
547 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
548 |
.fi |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
549 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
550 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
551 |
-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
|
552 |
-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
|
553 |
+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
|
554 |
+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
|
555 |
information about named branches and bookmarks. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
556 |
.RE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
557 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
558 |
@@ -737,23 +710,23 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
559 |
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
|
560 |
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
|
561 |
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
|
562 |
-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
|
563 |
+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
|
564 |
branch. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
565 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
566 |
Unless \-f/\-\-force is specified, branch will not let you set a |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
567 |
-branch name that already exists, even if it\(aqs inactive. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
568 |
+branch name that already exists, even if it's inactive. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
569 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
570 |
Use \-C/\-\-clean to reset the working directory branch to that of |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
571 |
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
|
572 |
change. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
573 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
574 |
-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
575 |
-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
576 |
+Use the command \fBhg update\fP to switch to an existing branch. Use |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
577 |
+\fBhg commit \-\-close\-branch\fP to mark this branch as closed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
578 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
579 |
Returns 0 on success. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
580 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
581 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
582 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
583 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
584 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
585 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
586 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
587 |
@@ -762,28 +735,28 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
588 |
.B \-C, \-\-clean |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
589 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
590 |
reset branch name to parent branch name |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
591 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
592 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
593 |
.SS branches |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
594 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
595 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
596 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
597 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
598 |
hg branches [\-ac] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
599 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
600 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
601 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
602 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
603 |
-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
|
604 |
+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
|
605 |
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
|
606 |
-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
|
607 |
+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
|
608 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
609 |
If \-a/\-\-active is specified, only show active branches. A branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
610 |
is considered active if it contains repository heads. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
611 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
612 |
-Use the command \%\fBhg update\fP\: to switch to an existing branch. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
613 |
+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
|
614 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
615 |
Returns 0. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
616 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
617 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
618 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
619 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
620 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
621 |
.B \-a, \-\-active |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
622 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
623 |
@@ -792,13 +765,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
624 |
.B \-c, \-\-closed |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
625 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
626 |
show normal and closed branches |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
627 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
628 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
629 |
.SS bundle |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
630 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
631 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
632 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
633 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
634 |
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
|
635 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
636 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
637 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
638 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
639 |
Generate a compressed changegroup file collecting changesets not |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
640 |
@@ -824,7 +797,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
641 |
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
|
642 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
643 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
644 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
645 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
646 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
647 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
648 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
649 |
@@ -861,13 +834,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
650 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
651 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
652 |
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
|
653 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
654 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
655 |
.SS cat |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
656 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
657 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
658 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
659 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
660 |
hg cat [OPTION]... FILE... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
661 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
662 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
663 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
664 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
665 |
Print the specified files as they were at the given revision. If |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
666 |
@@ -876,7 +849,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
667 |
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
|
668 |
given using a format string. The formatting rules are the same as |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
669 |
for the export command, with the following additions: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
670 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
671 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
672 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
673 |
.B \fB%s\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
674 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
675 |
@@ -884,17 +857,17 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
676 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
677 |
.B \fB%d\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
678 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
679 |
-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
|
680 |
+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
|
681 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
682 |
.B \fB%p\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
683 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
684 |
root\-relative path name of file being printed |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
685 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
686 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
687 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
688 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
689 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
690 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
691 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
692 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
693 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
694 |
.B \-o, \-\-output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
695 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
696 |
@@ -915,13 +888,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
697 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
698 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
699 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
700 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
701 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
702 |
.SS clone |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
703 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
704 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
705 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
706 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
707 |
hg clone [OPTION]... SOURCE [DEST] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
708 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
709 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
710 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
711 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
712 |
Create a copy of an existing repository in a new directory. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
713 |
@@ -929,22 +902,22 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
714 |
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
|
715 |
basename of the source. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
716 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
717 |
-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
|
718 |
-\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
|
719 |
+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
|
720 |
+\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
|
721 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
722 |
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
|
723 |
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
|
724 |
-\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
|
725 |
+\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
|
726 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
727 |
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
|
728 |
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
|
729 |
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
|
730 |
-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
|
731 |
+their ancestors. These options (or 'clone src#rev dest') imply |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
732 |
\-\-pull, even for local source repositories. Note that specifying a |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
733 |
tag will include the tagged changeset but not the changeset |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
734 |
containing the tag. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
735 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
736 |
-If the source repository has a bookmark called \(aq@\(aq set, that |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
737 |
+If the source repository has a bookmark called '@' set, that |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
738 |
revision will be checked out in the new repository by default. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
739 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
740 |
To check out a particular version, use \-u/\-\-update, or |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
741 |
@@ -961,9 +934,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
742 |
directory using full hardlinks with |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
743 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
744 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
745 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
746 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
747 |
$ cp \-al REPO REPOCLONE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
748 |
-.ft P |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
749 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
750 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
751 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
752 |
This is the fastest way to clone, but it is not always safe. The |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
753 |
@@ -975,7 +948,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
754 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
755 |
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
|
756 |
revision from this list: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
757 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
758 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
759 |
.IP a. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
760 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
761 |
null if \-U or the source repository has no changesets |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
762 |
@@ -982,7 +955,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
763 |
.IP b. 3 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
764 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
765 |
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
|
766 |
-the source repository\(aqs working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
767 |
+the source repository's working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
768 |
.IP c. 3 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
769 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
770 |
the changeset specified with \-u (if a branch name, this means the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
771 |
@@ -998,7 +971,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
772 |
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
|
773 |
.IP g. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
774 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
775 |
-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
|
776 |
+the revision marked with the '@' bookmark, if present |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
777 |
.IP h. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
778 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
779 |
the tipmost head of the default branch |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
780 |
@@ -1005,18 +978,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
781 |
.IP i. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
782 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
783 |
tip |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
784 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
785 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
786 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
787 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
788 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
789 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
790 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
791 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
792 |
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
|
793 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
794 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
795 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
796 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
797 |
hg clone http://selenic.com/hg |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
798 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
799 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
800 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
801 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
802 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
803 |
@@ -1023,9 +996,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
804 |
create a lightweight local clone: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
805 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
806 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
807 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
808 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
809 |
hg clone project/ project\-feature/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
810 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
811 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
812 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
813 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
814 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
815 |
@@ -1032,9 +1005,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
816 |
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
|
817 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
818 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
819 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
820 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
821 |
hg clone ssh://user@server//home/projects/alpha/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
822 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
823 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
824 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
825 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
826 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
827 |
@@ -1042,9 +1015,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
828 |
specified version: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
829 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
830 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
831 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
832 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
833 |
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
|
834 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
835 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
836 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
837 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
838 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
839 |
@@ -1051,9 +1024,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
840 |
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
|
841 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
842 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
843 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
844 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
845 |
hg clone \-r 04e544 experimental/ good/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
846 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
847 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
848 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
849 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
850 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
851 |
@@ -1060,18 +1033,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
852 |
clone (and track) a particular named branch: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
853 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
854 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
855 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
856 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
857 |
hg clone http://selenic.com/hg#stable |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
858 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
859 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
860 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
861 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
862 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
863 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
864 |
-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
|
865 |
+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
|
866 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
867 |
Returns 0 on success. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
868 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
869 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
870 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
871 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
872 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
873 |
.B \-U, \-\-noupdate |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
874 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
875 |
@@ -1108,20 +1081,20 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
876 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
877 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
878 |
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
|
879 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
880 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
881 |
.SS commit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
882 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
883 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
884 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
885 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
886 |
hg commit [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
887 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
888 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
889 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
890 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
891 |
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
|
892 |
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
|
893 |
-\%\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
|
894 |
+\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
|
895 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
896 |
-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
|
897 |
+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
|
898 |
will be committed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
899 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
900 |
If you are committing the result of a merge, do not provide any |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
901 |
@@ -1130,28 +1103,28 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
902 |
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
|
903 |
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
|
904 |
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
|
905 |
-\fB.hg/last\-message.txt\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
906 |
+\fB\&.hg/last\-message.txt\fP. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
907 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
908 |
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
|
909 |
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
|
910 |
-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
|
911 |
+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
|
912 |
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
|
913 |
-\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
|
914 |
+\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
|
915 |
on how to restore it). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
916 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
917 |
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
|
918 |
-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
|
919 |
+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
|
920 |
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
|
921 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
922 |
-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
|
923 |
+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
|
924 |
or changesets that have children. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
925 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
926 |
-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
|
927 |
+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
|
928 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
929 |
Returns 0 on success, 1 if nothing changed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
930 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
931 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
932 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
933 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
934 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
935 |
.B \-A, \-\-addremove |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
936 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
937 |
@@ -1198,13 +1171,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
938 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
939 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
940 |
aliases: ci |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
941 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
942 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
943 |
.SS copy |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
944 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
945 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
946 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
947 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
948 |
hg copy [OPTION]... [SOURCE]... DEST |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
949 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
950 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
951 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
952 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
953 |
Mark dest as having copies of source files. If dest is a |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
954 |
@@ -1216,12 +1189,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
955 |
operation is recorded, but no copying is performed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
956 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
957 |
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
|
958 |
-before that, see \%\fBhg revert\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
959 |
+before that, see \fBhg revert\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
960 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
961 |
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
|
962 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
963 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
964 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
965 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
966 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
967 |
.B \-A, \-\-after |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
968 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
969 |
@@ -1244,13 +1217,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
970 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
971 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
972 |
aliases: cp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
973 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
974 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
975 |
.SS diff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
976 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
977 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
978 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
979 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
980 |
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
|
981 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
982 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
983 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
984 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
985 |
Show differences between revisions for the specified files. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
986 |
@@ -1259,7 +1232,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
987 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
988 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
989 |
diff may generate unexpected results for merges, as it will |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
990 |
-default to comparing against the working directory\(aqs first |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
991 |
+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
|
992 |
parent changeset if no revisions are specified. |
99
c15c9099bb44
6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
993 |
.RE |
c15c9099bb44
6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
994 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
995 |
@@ -1277,18 +1250,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
996 |
anyway, probably with undesirable results. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
997 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
998 |
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
|
999 |
-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
|
1000 |
+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
|
1001 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1002 |
Examples: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1003 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1004 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1005 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1006 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1007 |
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
|
1008 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1009 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1010 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1011 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1012 |
hg diff foo.c |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1013 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1014 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1015 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1016 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1017 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1018 |
@@ -1295,9 +1268,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1019 |
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
|
1020 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1021 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1022 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1023 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1024 |
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
|
1025 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1026 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1027 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1028 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1029 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1030 |
@@ -1304,9 +1277,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1031 |
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
|
1032 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1033 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1034 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1035 |
-hg diff \-\-stat \-r "date(\(aqmay 2\(aq)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1036 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1037 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1038 |
+hg diff \-\-stat \-r "date('may 2')" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1039 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1040 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1041 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1042 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1043 |
@@ -1313,9 +1286,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1044 |
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
|
1045 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1046 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1047 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1048 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1049 |
hg diff "set:added() and grep(GNU)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1050 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1051 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1052 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1053 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1054 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1055 |
@@ -1322,18 +1295,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1056 |
compare a revision and its parents: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1057 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1058 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1059 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1060 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1061 |
hg diff \-c 9353 # compare against first parent |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1062 |
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
|
1063 |
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
|
1064 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1065 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1066 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1067 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1068 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1069 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1070 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1071 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1072 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1073 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1074 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1075 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1076 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1077 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1078 |
@@ -1394,13 +1367,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1079 |
.B \-S, \-\-subrepos |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1080 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1081 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1082 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1083 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1084 |
.SS export |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1085 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1086 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1087 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1088 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1089 |
hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]... |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1090 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1091 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1092 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1093 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1094 |
Print the changeset header and diffs for one or more revisions. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1095 |
@@ -1418,7 +1391,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1096 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1097 |
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
|
1098 |
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
|
1099 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1100 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1101 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1102 |
.B \fB%%\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1103 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1104 |
@@ -1455,7 +1428,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1105 |
.B \fB%r\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1106 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1107 |
zero\-padded changeset revision number |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1108 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1109 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1110 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1111 |
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
|
1112 |
of files it detects as binary. With \-a, export will generate a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1113 |
@@ -1462,13 +1435,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1114 |
diff anyway, probably with undesirable results. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1115 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1116 |
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
|
1117 |
-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
|
1118 |
+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
|
1119 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1120 |
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
|
1121 |
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
|
1122 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1123 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1124 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1125 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1126 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1127 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1128 |
use export and import to transplant a bugfix to the current |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1129 |
@@ -1475,9 +1448,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1130 |
branch: |
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 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1133 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1134 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1135 |
hg export \-r 9353 | hg import \- |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1136 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1137 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1138 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1139 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1140 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1141 |
@@ -1485,9 +1458,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1142 |
rename information: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1143 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1144 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1145 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1146 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1147 |
hg export \-\-git \-r 123:150 > changes.txt |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1148 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1149 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1150 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1151 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1152 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1153 |
@@ -1495,16 +1468,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1154 |
descriptive names: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1155 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1156 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1157 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1158 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1159 |
hg export \-r "outgoing()" \-o "%n\-%m.patch" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1160 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1161 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1162 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1163 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1164 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1165 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1166 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1167 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1168 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1169 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1170 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1171 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1172 |
.B \-o, \-\-output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1173 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1174 |
@@ -1529,13 +1502,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1175 |
.B \-\-nodates |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1176 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1177 |
omit dates from diff headers |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1178 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1179 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1180 |
.SS forget |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1181 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1182 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1183 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1184 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1185 |
hg forget [OPTION]... FILE... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1186 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1187 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1188 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1189 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1190 |
Mark the specified files so they will no longer be tracked |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1191 |
@@ -1545,18 +1518,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1192 |
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
|
1193 |
working directory. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1194 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1195 |
-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
|
1196 |
+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
|
1197 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1198 |
Examples: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1199 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1200 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1201 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1202 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1203 |
forget newly\-added binary files: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1204 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1205 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1206 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1207 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1208 |
hg forget "set:added() and binary()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1209 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1210 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1211 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1212 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1213 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1214 |
@@ -1563,16 +1536,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1215 |
forget files that would be excluded by .hgignore: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1216 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1217 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1218 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1219 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1220 |
hg forget "set:hgignore()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1221 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1222 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1223 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1224 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1225 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1226 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1227 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1228 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1229 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1230 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1231 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1232 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1233 |
.B \-I, \-\-include |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1234 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1235 |
@@ -1581,19 +1554,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1236 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1237 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1238 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1239 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1240 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1241 |
.SS graft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1242 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1243 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1244 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1245 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1246 |
hg graft [OPTION]... [\-r] REV... |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1247 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1248 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1249 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1250 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1251 |
-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
|
1252 |
+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
|
1253 |
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
|
1254 |
-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
|
1255 |
-\(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
|
1256 |
+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
|
1257 |
+\&'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
|
1258 |
description from the source changesets. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1259 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1260 |
Changesets that are ancestors of the current revision, that have |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1261 |
@@ -1603,9 +1576,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1262 |
of the form: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1263 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1264 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1265 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1266 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1267 |
(grafted from CHANGESETHASH) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1268 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1269 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1270 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1271 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1272 |
If a graft merge results in conflicts, the graft process is |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1273 |
@@ -1618,16 +1591,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1274 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1275 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1276 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1277 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1278 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1279 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1280 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1281 |
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
|
1282 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1283 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1284 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1285 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1286 |
hg update stable |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1287 |
hg graft \-\-edit 9393 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1288 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1289 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1290 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1291 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1292 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1293 |
@@ -1634,9 +1607,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1294 |
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
|
1295 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1296 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1297 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1298 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1299 |
hg graft \-D "2085::2093 and not 2091" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1300 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1301 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1302 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1303 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1304 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1305 |
@@ -1643,9 +1616,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1306 |
continue a graft after resolving conflicts: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1307 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1308 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1309 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1310 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1311 |
hg graft \-c |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1312 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1313 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1314 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1315 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1316 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1317 |
@@ -1652,16 +1625,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1318 |
show the source of a grafted changeset: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1319 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1320 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1321 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1322 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1323 |
hg log \-\-debug \-r . |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1324 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1325 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1326 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1327 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1328 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1329 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1330 |
Returns 0 on successful completion. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1331 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1332 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1333 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1334 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1335 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1336 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1337 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1338 |
@@ -1702,13 +1675,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1339 |
.B \-n, \-\-dry\-run |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1340 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1341 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1342 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1343 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1344 |
.SS grep |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1345 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1346 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1347 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1348 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1349 |
hg grep [OPTION]... PATTERN [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1350 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1351 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1352 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1353 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1354 |
Search revisions of files for a regular expression. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1355 |
@@ -1727,7 +1700,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1356 |
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
|
1357 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1358 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1359 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1360 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1361 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1362 |
.B \-0, \-\-print0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1363 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1364 |
@@ -1776,13 +1749,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1365 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1366 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1367 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1368 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1369 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1370 |
.SS heads |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1371 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1372 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1373 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1374 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1375 |
hg heads [\-ct] [\-r STARTREV] [REV]... |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1376 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1377 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1378 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1379 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1380 |
With no arguments, show all open branch heads in the repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1381 |
@@ -1792,11 +1765,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1382 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1383 |
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
|
1384 |
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
|
1385 |
-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
|
1386 |
+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
|
1387 |
currently checked\-out branch. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1388 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1389 |
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
|
1390 |
-(see \%\fBhg commit \-\-close\-branch\fP\:). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1391 |
+(see \fBhg commit \-\-close\-branch\fP). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1392 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1393 |
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
|
1394 |
STARTREV will be displayed. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1395 |
@@ -1807,7 +1780,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1396 |
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
|
1397 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1398 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1399 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1400 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1401 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1402 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1403 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1404 |
@@ -1832,13 +1805,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1405 |
.B \-\-template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1406 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1407 |
display with template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1408 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1409 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1410 |
.SS help |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1411 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1412 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1413 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1414 |
+.ft |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1415 |
hg help [\-ec] [TOPIC] |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1416 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1417 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1418 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1419 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1420 |
With no arguments, print a list of commands with short help messages. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1421 |
@@ -1849,7 +1822,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1422 |
Returns 0 if successful. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1423 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1424 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1425 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1426 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1427 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1428 |
.B \-e, \-\-extension |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1429 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1430 |
@@ -1862,13 +1835,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1431 |
.B \-k, \-\-keyword |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1432 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1433 |
show topics matching keyword |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1434 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1435 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1436 |
.SS identify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1437 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1438 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1439 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1440 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1441 |
hg identify [\-nibtB] [\-r REV] [SOURCE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1442 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1443 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1444 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1445 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1446 |
Print a summary identifying the repository state at REV using one or |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1447 |
@@ -1883,15 +1856,15 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1448 |
cause lookup to operate on that repository/bundle. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1449 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1450 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1451 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1452 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1453 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1454 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1455 |
generate a build identifier for the working directory: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1456 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1457 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1458 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1459 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1460 |
hg id \-\-id > build\-id.dat |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1461 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1462 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1463 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1464 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1465 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1466 |
@@ -1898,9 +1871,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1467 |
find the revision corresponding to a tag: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1468 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1469 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1470 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1471 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1472 |
hg id \-n \-r 1.3 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1473 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1474 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1475 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1476 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1477 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1478 |
@@ -1907,16 +1880,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1479 |
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
|
1480 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1481 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1482 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1483 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1484 |
hg id \-r tip http://selenic.com/hg/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1485 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1486 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1487 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1488 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1489 |
+.RE |
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 |
Returns 0 if successful. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1492 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1493 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1494 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1495 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1496 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1497 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1498 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1499 |
@@ -1955,13 +1928,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1500 |
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
|
1501 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1502 |
aliases: id |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1503 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1504 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1505 |
.SS import |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1506 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1507 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1508 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1509 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1510 |
hg import [OPTION]... PATCH... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1511 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1512 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1513 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1514 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1515 |
Import a list of patches and commit them individually (unless |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1516 |
@@ -1977,7 +1950,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1517 |
text/plain body parts before first diff are added to commit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1518 |
message. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1519 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1520 |
-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
|
1521 |
+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
|
1522 |
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
|
1523 |
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
|
1524 |
override these. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1525 |
@@ -1994,22 +1967,22 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1526 |
revision. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1527 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1528 |
With \-s/\-\-similarity, hg will attempt to discover renames and |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1529 |
-copies in the patch in the same way as \%\fBhg addremove\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1530 |
+copies in the patch in the same way as \fBhg addremove\fP. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1531 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1532 |
To read a patch from standard input, use "\-" as the patch name. If |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1533 |
a URL is specified, the patch will be downloaded from it. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1534 |
-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
|
1535 |
+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
|
1536 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1537 |
Examples: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1538 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1539 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1540 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1541 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1542 |
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
|
1543 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1544 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1545 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1546 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1547 |
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
|
1548 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1549 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1550 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1551 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1552 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1553 |
@@ -2016,9 +1989,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1554 |
import a changeset from an hgweb server: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1555 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1556 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1557 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1558 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1559 |
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
|
1560 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1561 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1562 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1563 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1564 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1565 |
@@ -2025,9 +1998,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1566 |
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
|
1567 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1568 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1569 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1570 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1571 |
hg import incoming\-patches.mbox |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1572 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1573 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1574 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1575 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1576 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1577 |
@@ -2035,16 +2008,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1578 |
possible): |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1579 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1580 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1581 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1582 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1583 |
hg import \-\-exact proposed\-fix.patch |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1584 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1585 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1586 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1587 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1588 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1589 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1590 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1591 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1592 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1593 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1594 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1595 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1596 |
.B \-p, \-\-strip |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1597 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1598 |
@@ -2064,7 +2037,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1599 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1600 |
.B \-\-no\-commit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1601 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1602 |
-don\(aqt commit, just update the working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1603 |
+don't commit, just update the working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1604 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1605 |
.B \-\-bypass |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1606 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1607 |
@@ -2099,13 +2072,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1608 |
guess renamed files by similarity (0<=s<=100) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1609 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1610 |
aliases: patch |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1611 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1612 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1613 |
.SS incoming |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1614 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1615 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1616 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1617 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1618 |
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
|
1619 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1620 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1621 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1622 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1623 |
Show new changesets found in the specified path/URL or the default |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1624 |
@@ -2120,7 +2093,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1625 |
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
|
1626 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1627 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1628 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1629 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1630 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1631 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1632 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1633 |
@@ -2195,13 +2168,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1634 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1635 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1636 |
aliases: in |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1637 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1638 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1639 |
.SS init |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1640 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1641 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1642 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1643 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1644 |
hg init [\-e CMD] [\-\-remotecmd CMD] [DEST] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1645 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1646 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1647 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1648 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1649 |
Initialize a new repository in the given directory. If the given |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1650 |
@@ -2210,12 +2183,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1651 |
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
|
1652 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1653 |
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
|
1654 |
-See \%\fBhg help urls\fP\: for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1655 |
+See \fBhg help urls\fP for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1656 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1657 |
Returns 0 on success. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1658 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1659 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1660 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1661 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1662 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1663 |
.B \-e, \-\-ssh |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1664 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1665 |
@@ -2228,13 +2201,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1666 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1667 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1668 |
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
|
1669 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1670 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1671 |
.SS locate |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1672 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1673 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1674 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1675 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1676 |
hg locate [OPTION]... [PATTERN]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1677 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1678 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1679 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1680 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1681 |
Print files under Mercurial control in the working directory whose |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1682 |
@@ -2255,7 +2228,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1683 |
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
|
1684 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1685 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1686 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1687 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1688 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1689 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1690 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1691 |
@@ -2276,13 +2249,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1692 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1693 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1694 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1695 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1696 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1697 |
.SS log |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1698 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1699 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1700 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1701 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1702 |
hg log [OPTION]... [FILE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1703 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1704 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1705 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1706 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1707 |
Print the revision history of the specified files or the entire |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1708 |
@@ -2317,15 +2290,15 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1709 |
.RE |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1710 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1711 |
Some examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1712 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1713 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1714 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1715 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1716 |
changesets with full descriptions and file lists: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1717 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1718 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1719 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1720 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1721 |
hg log \-v |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1722 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1723 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1724 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1725 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1726 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1727 |
@@ -2332,9 +2305,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1728 |
changesets ancestral to the working directory: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1729 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1730 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1731 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1732 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1733 |
hg log \-f |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1734 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1735 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1736 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1737 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1738 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1739 |
@@ -2341,9 +2314,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1740 |
last 10 commits on the current branch: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1741 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1742 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1743 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1744 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1745 |
hg log \-l 10 \-b . |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1746 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1747 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1748 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1749 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1750 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1751 |
@@ -2350,9 +2323,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1752 |
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
|
1753 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1754 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1755 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1756 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1757 |
hg log \-\-removed file.c |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1758 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1759 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1760 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1761 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1762 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1763 |
@@ -2359,9 +2332,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1764 |
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
|
1765 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1766 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1767 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1768 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1769 |
hg log \-Mp lib/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1770 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1771 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1772 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1773 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1774 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1775 |
@@ -2368,9 +2341,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1776 |
all revision numbers that match a keyword: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1777 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1778 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1779 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1780 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1781 |
hg log \-k bug \-\-template "{rev}\en" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1782 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1783 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1784 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1785 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1786 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1787 |
@@ -2377,9 +2350,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1788 |
check if a given changeset is included is a tagged release: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1789 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1790 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1791 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1792 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1793 |
hg log \-r "a21ccf and ancestor(1.9)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1794 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1795 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1796 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1797 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1798 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1799 |
@@ -2386,9 +2359,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1800 |
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
|
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 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
|
1806 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1807 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1808 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1809 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1810 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1811 |
@@ -2395,24 +2368,24 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1812 |
summary of all changesets after the last tag: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1813 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1814 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1815 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1816 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1817 |
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
|
1818 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1819 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1820 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1821 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1822 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1823 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1824 |
-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
|
1825 |
+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
|
1826 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1827 |
-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
|
1828 |
+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
|
1829 |
specifying revisions. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1830 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1831 |
-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
|
1832 |
+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
|
1833 |
specifying custom templates. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1834 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1835 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1836 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1837 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1838 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1839 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1840 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1841 |
.B \-f, \-\-follow |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1842 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1843 |
@@ -2503,13 +2476,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1844 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1845 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1846 |
aliases: history |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1847 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1848 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1849 |
.SS manifest |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1850 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1851 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1852 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1853 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1854 |
hg manifest [\-r REV] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1855 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1856 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1857 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1858 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1859 |
Print a list of version controlled files for the given revision. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1860 |
@@ -2525,7 +2498,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1861 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1862 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1863 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1864 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1865 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1866 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1867 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1868 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1869 |
@@ -2534,13 +2507,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1870 |
.B \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1871 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1872 |
list files from all revisions |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1873 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1874 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1875 |
.SS merge |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1876 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1877 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1878 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1879 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1880 |
hg merge [\-P] [\-f] [[\-r] REV] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1881 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1882 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1883 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1884 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1885 |
The current working directory is updated with all changes made in |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1886 |
@@ -2553,16 +2526,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1887 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
1888 |
\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
|
1889 |
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
|
1890 |
-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
|
1891 |
+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
|
1892 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1893 |
-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
|
1894 |
+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
|
1895 |
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
|
1896 |
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
|
1897 |
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
|
1898 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1899 |
-\%\fBhg resolve\fP\: must be used to resolve unresolved files. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1900 |
+\fBhg resolve\fP must be used to resolve unresolved files. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1901 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1902 |
-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
|
1903 |
+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
|
1904 |
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
|
1905 |
all changes. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1906 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1907 |
@@ -2569,7 +2542,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1908 |
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
|
1909 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1910 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1911 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1912 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1913 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1914 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1915 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1916 |
@@ -2586,13 +2559,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1917 |
.B \-t, \-\-tool |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1918 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1919 |
specify merge tool |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1920 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1921 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1922 |
.SS outgoing |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1923 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1924 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1925 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1926 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1927 |
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
|
1928 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1929 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1930 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1931 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1932 |
Show changesets not found in the specified destination repository |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1933 |
@@ -2604,7 +2577,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1934 |
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
|
1935 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1936 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1937 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1938 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1939 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1940 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1941 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1942 |
@@ -2675,16 +2648,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1943 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1944 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1945 |
aliases: out |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1946 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1947 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1948 |
.SS parents |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1949 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1950 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1951 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1952 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1953 |
hg parents [\-r REV] [FILE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1954 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1955 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1956 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1957 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1958 |
-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
|
1959 |
+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
|
1960 |
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
|
1961 |
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
|
1962 |
last changed (before the working directory revision or the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1963 |
@@ -2693,7 +2666,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1964 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1965 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1966 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1967 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1968 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1969 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1970 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1971 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1972 |
@@ -2706,13 +2679,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1973 |
.B \-\-template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1974 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1975 |
display with template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1976 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1977 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1978 |
.SS paths |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1979 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1980 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1981 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1982 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1983 |
hg paths [NAME] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1984 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1985 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1986 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1987 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1988 |
Show definition of symbolic path name NAME. If no name is given, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
1989 |
@@ -2733,18 +2706,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1990 |
as the fallback for both. When cloning a repository, the clone |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1991 |
source is written as \fBdefault\fP in \fB.hg/hgrc\fP. Note that |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1992 |
\fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1993 |
-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1994 |
-\%\fBhg bundle\fP\:) operations. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1995 |
+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1996 |
+\fBhg bundle\fP) operations. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1997 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1998 |
-See \%\fBhg help urls\fP\: for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
1999 |
+See \fBhg help urls\fP for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2000 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2001 |
Returns 0 on success. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2002 |
.SS phase |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2003 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2004 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2005 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2006 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2007 |
hg phase [\-p|\-d|\-s] [\-f] [\-r] REV... |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2008 |
-.ft P |
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 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2011 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2012 |
With no argument, show the phase name of specified revisions. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2013 |
@@ -2752,13 +2725,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2014 |
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
|
2015 |
phase value of the specified revisions. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2016 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2017 |
-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
|
2018 |
+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
|
2019 |
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
|
2020 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2021 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2022 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2023 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2024 |
public < draft < secret |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2025 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2026 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2027 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2028 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2029 |
Return 0 on success, 1 if no phases were changed or some could not |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2030 |
@@ -2765,7 +2738,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2031 |
be changed. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2032 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2033 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2034 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2035 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2036 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2037 |
.B \-p, \-\-public |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2038 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2039 |
@@ -2786,13 +2759,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2040 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2041 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2042 |
target revision |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2043 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2044 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2045 |
.SS pull |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2046 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2047 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2048 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2049 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2050 |
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
|
2051 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2052 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2053 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2054 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2055 |
Pull changes from a remote repository to a local one. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2056 |
@@ -2802,18 +2775,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2057 |
\-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
|
2058 |
project in the working directory. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2059 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2060 |
-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
|
2061 |
+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
|
2062 |
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
|
2063 |
-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
|
2064 |
-\-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
|
2065 |
+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
|
2066 |
+\-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
|
2067 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2068 |
-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
|
2069 |
-See \%\fBhg help urls\fP\: for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2070 |
+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
|
2071 |
+See \fBhg help urls\fP for more information. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2072 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2073 |
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
|
2074 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2075 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2076 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2077 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2078 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2079 |
.B \-u, \-\-update |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2080 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2081 |
@@ -2846,13 +2819,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2082 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2083 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2084 |
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
|
2085 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2086 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2087 |
.SS push |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2088 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2089 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2090 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2091 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2092 |
hg 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
|
2093 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2094 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2095 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2096 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2097 |
Push changesets from the local repository to the specified |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2098 |
@@ -2883,13 +2856,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2099 |
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
|
2100 |
repository. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2101 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2102 |
-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
|
2103 |
+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
|
2104 |
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
|
2105 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2106 |
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
|
2107 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2108 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2109 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2110 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2111 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2112 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2113 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2114 |
@@ -2922,13 +2895,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2115 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2116 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2117 |
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
|
2118 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2119 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2120 |
.SS recover |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2121 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2122 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2123 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2124 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2125 |
hg recover |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2126 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2127 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2128 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2129 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2130 |
Recover from an interrupted commit or pull. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2131 |
@@ -2941,16 +2914,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2132 |
.SS remove |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2133 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2134 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2135 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2136 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2137 |
hg remove [OPTION]... FILE... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2138 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2139 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2140 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2141 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2142 |
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
|
2143 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2144 |
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
|
2145 |
-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
|
2146 |
-files, see \%\fBhg forget\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2147 |
+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
|
2148 |
+files, see \fBhg forget\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2149 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2150 |
\-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
|
2151 |
been deleted, \-f/\-\-force can be used to force deletion, and \-Af |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2152 |
@@ -2960,7 +2933,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2153 |
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
|
2154 |
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
|
2155 |
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
|
2156 |
-(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
|
2157 |
+(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
|
2158 |
(from branch) and Delete (from disk): |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2159 |
.TS |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2160 |
center; |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2161 |
@@ -3034,7 +3007,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2162 |
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
|
2163 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2164 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2165 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2166 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2167 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2168 |
.B \-A, \-\-after |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2169 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2170 |
@@ -3053,13 +3026,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2171 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2172 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2173 |
aliases: rm |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2174 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2175 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2176 |
.SS rename |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2177 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2178 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2179 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2180 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2181 |
hg rename [OPTION]... SOURCE... DEST |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2182 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2183 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2184 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2185 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2186 |
Mark dest as copies of sources; mark sources for deletion. If dest |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2187 |
@@ -3071,12 +3044,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2188 |
operation is recorded, but no copying is performed. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2189 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2190 |
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
|
2191 |
-before that, see \%\fBhg revert\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2192 |
+before that, see \fBhg revert\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2193 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2194 |
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
|
2195 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2196 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2197 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2198 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2199 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2200 |
.B \-A, \-\-after |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2201 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2202 |
@@ -3099,13 +3072,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2203 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2204 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2205 |
aliases: move mv |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2206 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2207 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2208 |
.SS resolve |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2209 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2210 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2211 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2212 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2213 |
hg resolve [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2214 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2215 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2216 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2217 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2218 |
Merges with unresolved conflicts are often the result of |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2219 |
@@ -3112,15 +3085,15 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2220 |
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
|
2221 |
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
|
2222 |
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
|
2223 |
-\%\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
|
2224 |
-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
|
2225 |
-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
|
2226 |
+\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
|
2227 |
+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
|
2228 |
+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
|
2229 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2230 |
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
|
2231 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2232 |
+.RS 0 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2233 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2234 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2235 |
-\%\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
|
2236 |
+\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
|
2237 |
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
|
2238 |
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
|
2239 |
to select all unresolved files. \fB\-\-tool\fP can be used to specify |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2240 |
@@ -3129,27 +3102,27 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2241 |
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
|
2242 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2243 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2244 |
-\%\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
|
2245 |
+\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
|
2246 |
(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
|
2247 |
to mark all unresolved files. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2248 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2249 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2250 |
-\%\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
|
2251 |
+\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
|
2252 |
default is to mark all resolved files. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2253 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2254 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2255 |
-\%\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
|
2256 |
+\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
|
2257 |
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
|
2258 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2259 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2260 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2261 |
Note that Mercurial will not let you commit files with unresolved |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2262 |
-merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2263 |
+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2264 |
commit after a conflicting merge. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2265 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2266 |
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
|
2267 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2268 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2269 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2270 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2271 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2272 |
.B \-a, \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2273 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2274 |
@@ -3182,19 +3155,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2275 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2276 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2277 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2278 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2279 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2280 |
.SS revert |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2281 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2282 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2283 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2284 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2285 |
hg revert [OPTION]... [\-r REV] [NAME]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2286 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2287 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2288 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2289 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2290 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2291 |
-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
|
2292 |
+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
|
2293 |
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
|
2294 |
-use \%\fBhg update \-\-clean .\fP\:. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2295 |
+use \fBhg update \-\-clean .\fP. |
99
c15c9099bb44
6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
2296 |
.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2297 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2298 |
With no revision specified, revert the specified files or directories |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2299 |
@@ -3208,18 +3181,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2300 |
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
|
2301 |
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
|
2302 |
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
|
2303 |
-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
|
2304 |
+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
|
2305 |
related method. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2306 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2307 |
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
|
2308 |
To disable these backups, use \-\-no\-backup. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2309 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2310 |
-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
|
2311 |
+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
|
2312 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2313 |
Returns 0 on success. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2314 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2315 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2316 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2317 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2318 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2319 |
.B \-a, \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2320 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2321 |
@@ -3248,16 +3221,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2322 |
.B \-n, \-\-dry\-run |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2323 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2324 |
do not perform actions, just print output |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2325 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2326 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2327 |
.SS rollback |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2328 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2329 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2330 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2331 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2332 |
hg rollback |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2333 |
-.ft P |
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 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2336 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2337 |
-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
|
2338 |
+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
|
2339 |
mistakes in the last commit. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2340 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2341 |
This command should be used with care. There is only one level of |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2342 |
@@ -3272,7 +3245,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2343 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2344 |
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
|
2345 |
effects can be rolled back: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2346 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2347 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2348 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2349 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2350 |
commit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2351 |
@@ -3288,10 +3261,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2352 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2353 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2354 |
unbundle |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2355 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2356 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2357 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2358 |
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
|
2359 |
-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
|
2360 |
+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
|
2361 |
override this protection. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2362 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2363 |
This command is not intended for use on public repositories. Once |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2364 |
@@ -3304,7 +3277,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2365 |
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
|
2366 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2367 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2368 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2369 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2370 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2371 |
.B \-n, \-\-dry\-run |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2372 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2373 |
@@ -3313,13 +3286,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2374 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2375 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2376 |
ignore safety measures |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2377 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2378 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2379 |
.SS root |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2380 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2381 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2382 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2383 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2384 |
hg root |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2385 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2386 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2387 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2388 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2389 |
Print the root directory of the current repository. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2390 |
@@ -3328,9 +3301,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2391 |
.SS serve |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2392 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2393 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2394 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2395 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2396 |
hg serve [OPTION]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2397 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2398 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2399 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2400 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2401 |
Start a local HTTP repository browser and pull server. You can use |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2402 |
@@ -3355,7 +3328,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2403 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2404 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2405 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2406 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2407 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2408 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2409 |
.B \-A, \-\-accesslog |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2410 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2411 |
@@ -3424,13 +3397,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2412 |
.B \-\-certificate |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2413 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2414 |
SSL certificate file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2415 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2416 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2417 |
.SS showconfig |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2418 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2419 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2420 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2421 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2422 |
hg showconfig [\-u] [NAME]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2423 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2424 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2425 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2426 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2427 |
With no arguments, print names and values of all config items. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2428 |
@@ -3447,7 +3420,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2429 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2430 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2431 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2432 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2433 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2434 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2435 |
.B \-u, \-\-untrusted |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2436 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2437 |
@@ -3454,13 +3427,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2438 |
show untrusted configuration options |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2439 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2440 |
aliases: debugconfig |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2441 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2442 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2443 |
.SS status |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2444 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2445 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2446 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2447 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2448 |
hg status [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2449 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2450 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2451 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2452 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2453 |
Show status of files in the repository. If names are given, only |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2454 |
@@ -3488,7 +3461,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2455 |
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
|
2456 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2457 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2458 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2459 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2460 |
M = modified |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2461 |
A = added |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2462 |
R = removed |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2463 |
@@ -3497,11 +3470,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2464 |
? = not tracked |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2465 |
I = ignored |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2466 |
= origin of the previous file listed as A (added) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2467 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2468 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2469 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2470 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2471 |
Examples: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2472 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2473 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2474 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2475 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2476 |
show changes in the working directory relative to a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2477 |
@@ -3508,9 +3481,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2478 |
changeset: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2479 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2480 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2481 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2482 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2483 |
hg status \-\-rev 9353 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2484 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2485 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2486 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2487 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2488 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2489 |
@@ -3517,9 +3490,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2490 |
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
|
2491 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2492 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2493 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2494 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2495 |
hg status \-\-copies \-\-change 9353 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2496 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2497 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2498 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2499 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2500 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2501 |
@@ -3526,16 +3499,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2502 |
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
|
2503 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2504 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2505 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2506 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2507 |
hg status \-an0 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2508 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2509 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2510 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2511 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2512 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2513 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2514 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2515 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2516 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2517 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2518 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2519 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2520 |
.B \-A, \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2521 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2522 |
@@ -3602,13 +3575,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2523 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2524 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2525 |
aliases: st |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2526 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2527 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2528 |
.SS summary |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2529 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2530 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2531 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2532 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2533 |
hg summary [\-\-remote] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2534 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2535 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2536 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2537 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2538 |
This generates a brief summary of the working directory state, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2539 |
@@ -3620,7 +3593,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2540 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2541 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2542 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2543 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2544 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2545 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2546 |
.B \-\-remote |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2547 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2548 |
@@ -3627,13 +3600,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2549 |
check for push and pull |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2550 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2551 |
aliases: sum |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2552 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2553 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2554 |
.SS tag |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2555 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2556 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2557 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2558 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2559 |
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
|
2560 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2561 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2562 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2563 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2564 |
Name a particular revision using <name>. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2565 |
@@ -3654,11 +3627,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2566 |
repositories). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2567 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2568 |
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
|
2569 |
-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
|
2570 |
+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
|
2571 |
\-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
|
2572 |
changeset. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2573 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2574 |
-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
|
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 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2577 |
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
|
2578 |
lookup, using an existing branch name as a tag name is discouraged. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2579 |
@@ -3666,7 +3639,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2580 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2581 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2582 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2583 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2584 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2585 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2586 |
.B \-f, \-\-force |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2587 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2588 |
@@ -3699,13 +3672,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2589 |
.B \-u, \-\-user |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2590 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2591 |
record the specified user as committer |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2592 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2593 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2594 |
.SS tags |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2595 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2596 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2597 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2598 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2599 |
hg tags |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2600 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2601 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2602 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2603 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2604 |
This lists both regular and local tags. When the \-v/\-\-verbose |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2605 |
@@ -3715,9 +3688,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2606 |
.SS tip |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2607 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2608 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2609 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2610 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2611 |
hg tip [\-p] [\-g] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2612 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2613 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2614 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2615 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2616 |
The tip revision (usually just called the tip) is the changeset |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2617 |
@@ -3729,12 +3702,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2618 |
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
|
2619 |
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
|
2620 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2621 |
-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
|
2622 |
+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
|
2623 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2624 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2625 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2626 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2627 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2628 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2629 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2630 |
.B \-p, \-\-patch |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2631 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2632 |
@@ -3751,13 +3724,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2633 |
.B \-\-template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2634 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2635 |
display with template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2636 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2637 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2638 |
.SS unbundle |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2639 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2640 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2641 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2642 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2643 |
hg unbundle [\-u] FILE... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2644 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2645 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2646 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2647 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2648 |
Apply one or more compressed changegroup files generated by the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2649 |
@@ -3766,30 +3739,30 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2650 |
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
|
2651 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2652 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2653 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2654 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2655 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2656 |
.B \-u, \-\-update |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2657 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2658 |
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
|
2659 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2660 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2661 |
.SS update |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2662 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2663 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2664 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2665 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2666 |
hg update [\-c] [\-C] [\-d DATE] [[\-r] REV] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2667 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2668 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2669 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2670 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2671 |
-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
|
2672 |
+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
|
2673 |
changeset. If no changeset is specified, update to the tip of the |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2674 |
-current named branch and move the current bookmark (see \%\fBhg help |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2675 |
-bookmarks\fP\:). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2676 |
+current named branch and move the current bookmark (see \fBhg help |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2677 |
+bookmarks\fP). |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2678 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2679 |
-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
|
2680 |
-changeset (see \%\fBhg help parents\fP\:). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2681 |
+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
|
2682 |
+changeset (see \fBhg help parents\fP). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2683 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2684 |
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
|
2685 |
-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
|
2686 |
+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
|
2687 |
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
|
2688 |
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
|
2689 |
changeset. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2690 |
@@ -3796,12 +3769,12 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2691 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2692 |
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
|
2693 |
uncommitted changes: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2694 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2695 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2696 |
.IP 1. 3 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2697 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2698 |
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
|
2699 |
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
|
2700 |
-the working directory\(aqs parent, the uncommitted changes |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2701 |
+the working directory's parent, the uncommitted changes |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2702 |
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
|
2703 |
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
|
2704 |
not an ancestor or descendant (that is, it is on another |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2705 |
@@ -3815,23 +3788,23 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2706 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2707 |
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
|
2708 |
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
|
2709 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2710 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2711 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2712 |
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
|
2713 |
-\%\fBhg update \-\-clean .\fP\:. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2714 |
+\fBhg update \-\-clean .\fP. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2715 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2716 |
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
|
2717 |
-\%\fBhg clone \-U\fP\:). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2718 |
+\fBhg clone \-U\fP). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2719 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2720 |
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
|
2721 |
-\%\fBhg revert [\-r REV] NAME\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2722 |
+\fBhg revert [\-r REV] NAME\fP. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2723 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2724 |
-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
|
2725 |
+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
|
2726 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2727 |
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
|
2728 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2729 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2730 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2731 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2732 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2733 |
.B \-C, \-\-clean |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2734 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2735 |
@@ -3850,23 +3823,23 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2736 |
revision |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2737 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2738 |
aliases: up checkout co |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2739 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2740 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2741 |
.SS verify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2742 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2743 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2744 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2745 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2746 |
hg verify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2747 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2748 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2749 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2750 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2751 |
Verify the integrity of the current repository. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2752 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2753 |
-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
|
2754 |
+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
|
2755 |
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
|
2756 |
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
|
2757 |
integrity of their crosslinks and indices. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2758 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2759 |
-Please see \%http://mercurial.selenic.com/wiki/RepositoryCorruption\: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2760 |
+Please see http://mercurial.selenic.com/wiki/RepositoryCorruption |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2761 |
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
|
2762 |
repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2763 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2764 |
@@ -3874,9 +3847,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2765 |
.SS version |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2766 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2767 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2768 |
-.ft C |
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 |
hg version |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2771 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2772 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2773 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2774 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2775 |
output version and copyright information |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2776 |
@@ -3883,7 +3856,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2777 |
.SH DATE FORMATS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2778 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2779 |
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
|
2780 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2781 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2782 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2783 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2784 |
backout, commit, import, tag: Specify the commit date. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2785 |
@@ -3890,10 +3863,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2786 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2787 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2788 |
log, revert, update: Select revision(s) by date. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2789 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2790 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2791 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2792 |
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
|
2793 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2794 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2795 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2796 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2797 |
\fBWed Dec 6 13:18:29 2006\fP (local timezone assumed) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2798 |
@@ -3942,14 +3915,14 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2799 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2800 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2801 |
\fBnow\fP \- right now |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2802 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2803 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2804 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2805 |
-Lastly, there is Mercurial\(aqs internal format: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2806 |
-.INDENT 0.0 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2807 |
+Lastly, there is Mercurial's internal format: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2808 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2809 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2810 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2811 |
\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
|
2812 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2813 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2814 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2815 |
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
|
2816 |
is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2817 |
@@ -3957,7 +3930,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2818 |
(negative if the timezone is east of UTC). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2819 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2820 |
The log command also accepts date ranges: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2821 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2822 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2823 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2824 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2825 |
\fB<DATE\fP \- at or before a given date/time |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2826 |
@@ -3970,16 +3943,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2827 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2828 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2829 |
\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
|
2830 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2831 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2832 |
.SH DIFF FORMATS |
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 |
-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
|
2835 |
+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
|
2836 |
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
|
2837 |
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
|
2838 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2839 |
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
|
2840 |
following information: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2841 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2842 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2843 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2844 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2845 |
executable status and other permission bits |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2846 |
@@ -3992,7 +3965,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2847 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2848 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2849 |
creation or deletion of empty files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2850 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2851 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2852 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2853 |
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
|
2854 |
which addresses these limitations. The git diff format is not produced |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2855 |
@@ -4000,26 +3973,26 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2856 |
format. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2857 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2858 |
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
|
2859 |
-(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
|
2860 |
+(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
|
2861 |
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
|
2862 |
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
|
2863 |
-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
|
2864 |
+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
|
2865 |
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
|
2866 |
format for communicating changes. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2867 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2868 |
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
|
2869 |
-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
|
2870 |
+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
|
2871 |
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
|
2872 |
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
|
2873 |
.SH ENVIRONMENT VARIABLES |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2874 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2875 |
+.RS 0 |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2876 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2877 |
.B HG |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2878 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2879 |
-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
|
2880 |
+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
|
2881 |
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
|
2882 |
-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
|
2883 |
-\(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
|
2884 |
+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
|
2885 |
+\&'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
|
2886 |
Windows) is searched. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2887 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2888 |
.B HGEDITOR |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2889 |
@@ -4037,9 +4010,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2890 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2891 |
.B HGENCODINGMODE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2892 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2893 |
-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
|
2894 |
+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
|
2895 |
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
|
2896 |
-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
|
2897 |
+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
|
2898 |
settings include "replace", which replaces unknown characters, and |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2899 |
"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
|
2900 |
the \-\-encodingmode command\-line option. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2901 |
@@ -4046,7 +4019,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2902 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2903 |
.B HGENCODINGAMBIGUOUS |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2904 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2905 |
-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
|
2906 |
+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
|
2907 |
"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
|
2908 |
fonts. By default, Mercurial assumes ambiguous characters are |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2909 |
narrow, set this variable to "wide" if such characters cause |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2910 |
@@ -4068,19 +4041,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2911 |
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
|
2912 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2913 |
For each element in HGRCPATH: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2914 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2915 |
+.RS 7 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2916 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2917 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2918 |
-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
|
2919 |
+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
|
2920 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2921 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2922 |
otherwise, the file itself will be added |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2923 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2924 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2925 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2926 |
.B HGPLAIN |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2927 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2928 |
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
|
2929 |
-change Mercurial\(aqs default output. This includes encoding, |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2930 |
+change Mercurial's default output. This includes encoding, |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2931 |
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
|
2932 |
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
|
2933 |
in the face of existing user configuration. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2934 |
@@ -4101,7 +4074,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2935 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2936 |
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
|
2937 |
available values will be considered in this order: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2938 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2939 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2940 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2941 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2942 |
HGUSER (deprecated) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2943 |
@@ -4117,7 +4090,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2944 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2945 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2946 |
LOGNAME (with \fB@hostname\fP appended) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2947 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2948 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2949 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2950 |
(deprecated, use configuration file) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2951 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2952 |
@@ -4140,13 +4113,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2953 |
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
|
2954 |
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
|
2955 |
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
|
2956 |
-defaults to \(aqvi\(aq. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2957 |
+defaults to 'vi'. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2958 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2959 |
.B PYTHONPATH |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
2960 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2961 |
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
|
2962 |
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
|
2963 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2964 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2965 |
.SH USING ADDITIONAL FEATURES |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2966 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2967 |
Mercurial has the ability to add new features through the use of |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2968 |
@@ -4159,22 +4132,22 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2969 |
like this: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2970 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2971 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2972 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2973 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2974 |
[extensions] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2975 |
foo = |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2976 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2977 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2978 |
.fi |
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 |
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
|
2981 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2982 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2983 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2984 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2985 |
[extensions] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2986 |
myfeature = ~/.hgext/myfeature.py |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2987 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2988 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2989 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2990 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2991 |
-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
|
2992 |
+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
|
2993 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2994 |
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
|
2995 |
they can increase startup overhead; they may be meant for advanced |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
2996 |
@@ -4188,19 +4161,19 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2997 |
broader scope, prepend its path with !: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2998 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
2999 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3000 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3001 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3002 |
[extensions] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3003 |
# 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
|
3004 |
bar = !/path/to/extension/bar.py |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3005 |
# 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
|
3006 |
baz = ! |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3007 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3008 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3009 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3010 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3011 |
disabled extensions: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3012 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3013 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3014 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3015 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3016 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3017 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3018 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3019 |
.B acl |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3020 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3021 |
@@ -4272,7 +4245,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3022 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3023 |
.B inotify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3024 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3025 |
-accelerate status report using Linux\(aqs inotify service |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3026 |
+accelerate status report using Linux's inotify service |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3027 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3028 |
.B interhg |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3029 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3030 |
@@ -4353,9 +4326,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3031 |
.B zeroconf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3032 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3033 |
discover and advertise repositories on the local network |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3034 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3035 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3036 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3037 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3038 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3039 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3040 |
.SH SPECIFYING FILE SETS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3041 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3042 |
Mercurial supports a functional language for selecting a set of |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3043 |
@@ -4362,7 +4335,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3044 |
files. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3045 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3046 |
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
|
3047 |
-\(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
|
3048 |
+\&'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
|
3049 |
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
|
3050 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3051 |
Identifiers such as filenames or patterns must be quoted with single |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3052 |
@@ -4373,18 +4346,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3053 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3054 |
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
|
3055 |
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
|
3056 |
-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
|
3057 |
+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
|
3058 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3059 |
There is a single prefix operator: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3060 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3061 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3062 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3063 |
.B \fBnot x\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3064 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3065 |
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
|
3066 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3067 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3068 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3069 |
These are the supported infix operators: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3070 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3071 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3072 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3073 |
.B \fBx and y\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3074 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3075 |
@@ -4398,10 +4371,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3076 |
.B \fBx \- y\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3077 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3078 |
Files in x but not in y. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3079 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3080 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3081 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3082 |
The following predicates are supported: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3083 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3084 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3085 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3086 |
.B \fBadded()\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3087 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3088 |
@@ -4467,7 +4440,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3089 |
.B \fBsize(expression)\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3090 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3091 |
File size matches the given expression. Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3092 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3093 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3094 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3095 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3096 |
1k (files from 1024 to 2047 bytes) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3097 |
@@ -4480,7 +4453,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3098 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3099 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3100 |
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
|
3101 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3102 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3103 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3104 |
.B \fBsubrepo([pattern])\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3105 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3106 |
@@ -4498,18 +4471,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3107 |
.B \fBunresolved()\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3108 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3109 |
File that is marked unresolved according to the resolve state. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3110 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3111 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3112 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3113 |
Some sample queries: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3114 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3115 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3116 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3117 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3118 |
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
|
3119 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3120 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3121 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3122 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3123 |
hg status \-A "set:binary()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3124 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3125 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3126 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3127 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3128 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3129 |
@@ -4516,9 +4489,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3130 |
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
|
3131 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3132 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3133 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3134 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3135 |
hg forget "set:hgignore() and not ignored()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3136 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3137 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3138 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3139 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3140 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3141 |
@@ -4525,9 +4498,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3142 |
Find text files that contain a string: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3143 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3144 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3145 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3146 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3147 |
hg locate "set:grep(magic) and not binary()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3148 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3149 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3150 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3151 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3152 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3153 |
@@ -4534,9 +4507,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3154 |
Find C files in a non\-standard encoding: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3155 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3156 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3157 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3158 |
-hg locate "set:**.c and not encoding(\(aqUTF\-8\(aq)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3159 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3160 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3161 |
+hg locate "set:**.c and not encoding('UTF\-8')" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3162 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3163 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3164 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3165 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3166 |
@@ -4543,9 +4516,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3167 |
Revert copies of large binary files: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3168 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3169 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3170 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3171 |
-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
|
3172 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3173 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3174 |
+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
|
3175 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3176 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3177 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3178 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3179 |
@@ -4552,15 +4525,15 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3180 |
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
|
3181 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3182 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3183 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3184 |
-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
|
3185 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3186 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3187 |
+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
|
3188 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3189 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3190 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3191 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3192 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3193 |
-See also \%\fBhg help patterns\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3194 |
+See also \fBhg help patterns\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3195 |
.SH GLOSSARY |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3196 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3197 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3198 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3199 |
.B Ancestor |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3200 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3201 |
@@ -4568,7 +4541,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3202 |
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
|
3203 |
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
|
3204 |
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
|
3205 |
-ancestor. See also: \(aqDescendant\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3206 |
+ancestor. See also: 'Descendant'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3207 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3208 |
.B Bookmark |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3209 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3210 |
@@ -4575,7 +4548,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3211 |
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
|
3212 |
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
|
3213 |
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
|
3214 |
-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
|
3215 |
+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
|
3216 |
when you make a commit. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3217 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3218 |
Bookmarks can be renamed, copied and deleted. Bookmarks are local, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3219 |
@@ -4587,9 +4560,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3220 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3221 |
(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
|
3222 |
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
|
3223 |
-\(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
|
3224 |
+\&'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
|
3225 |
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
|
3226 |
-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
|
3227 |
+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
|
3228 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3229 |
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
|
3230 |
a remote repository, since new heads may be created by these |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3231 |
@@ -4604,7 +4577,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3232 |
(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
|
3233 |
its parent having more than one child. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3234 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3235 |
-Example: "I\(aqm going to branch at X". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3236 |
+Example: "I'm going to branch at X". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3237 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3238 |
.B Branch, anonymous |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3239 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3240 |
@@ -4623,19 +4596,19 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3241 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3242 |
.B Branch head |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3243 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3244 |
-See \(aqHead, branch\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3245 |
+See 'Head, branch'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3246 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3247 |
.B Branch, inactive |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3248 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3249 |
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
|
3250 |
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
|
3251 |
-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
|
3252 |
+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
|
3253 |
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
|
3254 |
-\%\fBhg branches \-\-active\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3255 |
+\fBhg branches \-\-active\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3256 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3257 |
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
|
3258 |
-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
|
3259 |
-\-\-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
|
3260 |
+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
|
3261 |
+\-\-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
|
3262 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3263 |
.B Branch, named |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3264 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3265 |
@@ -4642,8 +4615,8 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3266 |
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
|
3267 |
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
|
3268 |
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
|
3269 |
-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
|
3270 |
-\%\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
|
3271 |
+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
|
3272 |
+\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
|
3273 |
branches. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3274 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3275 |
Named branches can be thought of as a kind of namespace, dividing |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3276 |
@@ -4656,7 +4629,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3277 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3278 |
.B Branch tip |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3279 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3280 |
-See \(aqTip, branch\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3281 |
+See 'Tip, branch'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3282 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3283 |
.B Branch, topological |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3284 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3285 |
@@ -4706,24 +4679,24 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3286 |
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
|
3287 |
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
|
3288 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3289 |
-Example: "I\(aqm using checkout X." |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3290 |
+Example: "I'm using checkout X." |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3291 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3292 |
(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
|
3293 |
-\%\fBhg help update\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3294 |
+\fBhg help update\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3295 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3296 |
-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
|
3297 |
+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
|
3298 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3299 |
.B Child changeset |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3300 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3301 |
-See \(aqChangeset, child\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3302 |
+See 'Changeset, child'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3303 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3304 |
.B Close changeset |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3305 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3306 |
-See \(aqHead, closed branch\(aq |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3307 |
+See 'Head, closed branch' |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3308 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3309 |
.B Closed branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3310 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3311 |
-See \(aqBranch, closed\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3312 |
+See 'Branch, closed'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3313 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3314 |
.B Clone |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3315 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3316 |
@@ -4732,13 +4705,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3317 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3318 |
Example: "Is your clone up to date?". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3319 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3320 |
-(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
|
3321 |
+(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
|
3322 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3323 |
-Example: "I\(aqm going to clone the repository". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3324 |
+Example: "I'm going to clone the repository". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3325 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3326 |
.B Closed branch head |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3327 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3328 |
-See \(aqHead, closed branch\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3329 |
+See 'Head, closed branch'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3330 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3331 |
.B Commit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3332 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3333 |
@@ -4763,13 +4736,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3334 |
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
|
3335 |
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
|
3336 |
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
|
3337 |
-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
|
3338 |
+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
|
3339 |
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
|
3340 |
have at most two parents. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3341 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3342 |
.B Default branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3343 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3344 |
-See \(aqBranch, default\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3345 |
+See 'Branch, default'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3346 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3347 |
.B Descendant |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3348 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3349 |
@@ -4777,7 +4750,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3350 |
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
|
3351 |
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
|
3352 |
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
|
3353 |
-descendant. See also: \(aqAncestor\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3354 |
+descendant. See also: 'Ancestor'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3355 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3356 |
.B Diff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3357 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3358 |
@@ -4802,7 +4775,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3359 |
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
|
3360 |
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
|
3361 |
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
|
3362 |
-\(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
|
3363 |
+\&'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
|
3364 |
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
|
3365 |
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
|
3366 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3367 |
@@ -4810,17 +4783,17 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3368 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3369 |
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
|
3370 |
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
|
3371 |
-extensions. See \%\fBhg help phases\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3372 |
+extensions. See \fBhg help phases\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3373 |
.TP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3374 |
.B Graph |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3375 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3376 |
-See DAG and \%\fBhg log \-\-graph\fP\:. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3377 |
+See DAG and \fBhg log \-\-graph\fP. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3378 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3379 |
.B Head |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3380 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3381 |
-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
|
3382 |
-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
|
3383 |
-\(aqHead, repository\(aq for specific definitions. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3384 |
+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
|
3385 |
+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
|
3386 |
+\&'Head, repository' for specific definitions. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3387 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3388 |
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
|
3389 |
usual targets for update and merge operations. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3390 |
@@ -4832,9 +4805,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3391 |
.B Head, closed branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3392 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3393 |
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
|
3394 |
-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
|
3395 |
+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
|
3396 |
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
|
3397 |
-listed by \%\fBhg branches\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3398 |
+listed by \fBhg branches\fP. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3399 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3400 |
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
|
3401 |
child of the changeset that marks a head as closed. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3402 |
@@ -4863,11 +4836,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3403 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3404 |
.B Immutable history |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3405 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3406 |
-See \(aqHistory, immutable\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3407 |
+See 'History, immutable'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3408 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3409 |
.B Merge changeset |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3410 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3411 |
-See \(aqChangeset, merge\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3412 |
+See 'Changeset, merge'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3413 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3414 |
.B Manifest |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3415 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3416 |
@@ -4884,7 +4857,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3417 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3418 |
.B Named branch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3419 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3420 |
-See \(aqBranch, named\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3421 |
+See 'Branch, named'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3422 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3423 |
.B Null changeset |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3424 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3425 |
@@ -4891,30 +4864,30 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3426 |
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
|
3427 |
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
|
3428 |
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
|
3429 |
-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
|
3430 |
-or by the changeset ID \(aq000000000000\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3431 |
+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
|
3432 |
+or by the changeset ID '000000000000'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3433 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3434 |
.B Parent |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3435 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3436 |
-See \(aqChangeset, parent\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3437 |
+See 'Changeset, parent'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3438 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3439 |
.B Parent changeset |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3440 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3441 |
-See \(aqChangeset, parent\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3442 |
+See 'Changeset, parent'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3443 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3444 |
.B Parent, working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3445 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3446 |
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
|
3447 |
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
|
3448 |
-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
|
3449 |
-\%\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
|
3450 |
-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
|
3451 |
+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
|
3452 |
+\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
|
3453 |
+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
|
3454 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3455 |
.B Patch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3456 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3457 |
(Noun) The product of a diff operation. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3458 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3459 |
-Example: "I\(aqve sent you my patch." |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3460 |
+Example: "I've sent you my patch." |
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 |
(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
|
3463 |
changeset into another. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3464 |
@@ -4924,13 +4897,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3465 |
.B Phase |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3466 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3467 |
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
|
3468 |
-should be shared. See \%\fBhg help phases\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3469 |
+should be shared. See \fBhg help phases\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3470 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3471 |
.B Public |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3472 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3473 |
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
|
3474 |
-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
|
3475 |
-phases\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3476 |
+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
|
3477 |
+phases\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3478 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3479 |
.B Pull |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3480 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3481 |
@@ -4938,7 +4911,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3482 |
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
|
3483 |
repository. Note that this operation without special arguments |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3484 |
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
|
3485 |
-working directory. See \%\fBhg help pull\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3486 |
+working directory. See \fBhg help pull\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3487 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3488 |
.B Push |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3489 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3490 |
@@ -4946,7 +4919,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3491 |
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
|
3492 |
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
|
3493 |
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
|
3494 |
-sent. See \%\fBhg help push\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3495 |
+sent. See \fBhg help push\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3496 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3497 |
.B Repository |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3498 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3499 |
@@ -4959,13 +4932,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3500 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3501 |
.B Repository head |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3502 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3503 |
-See \(aqHead, repository\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3504 |
+See 'Head, repository'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3505 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3506 |
.B Revision |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3507 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3508 |
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
|
3509 |
-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
|
3510 |
-number\(aq; See also \(aqChangeset\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3511 |
+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
|
3512 |
+number'; See also 'Changeset'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3513 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3514 |
.B Revision number |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3515 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3516 |
@@ -4974,7 +4947,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3517 |
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
|
3518 |
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
|
3519 |
identify changesets uniquely between different clones, see |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3520 |
-\(aqChangeset id\(aq. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3521 |
+\&'Changeset id'. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3522 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3523 |
.B Revlog |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3524 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3525 |
@@ -4985,7 +4958,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3526 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3527 |
.B Rewriting history |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3528 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3529 |
-See \(aqHistory, rewriting\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3530 |
+See 'History, rewriting'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3531 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3532 |
.B Root |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3533 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3534 |
@@ -4995,13 +4968,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3535 |
.B Secret |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3536 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3537 |
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
|
3538 |
-or clone. See \%\fBhg help phases\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3539 |
+or clone. See \fBhg help phases\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3540 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3541 |
.B Tag |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3542 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3543 |
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
|
3544 |
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
|
3545 |
-\%\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
|
3546 |
+\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
|
3547 |
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
|
3548 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3549 |
.B Tip |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3550 |
@@ -5013,7 +4986,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3551 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3552 |
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
|
3553 |
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
|
3554 |
-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
|
3555 |
+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
|
3556 |
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
|
3557 |
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
|
3558 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3559 |
@@ -5021,22 +4994,22 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3560 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3561 |
(Noun) Another synonym of changeset. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3562 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3563 |
-Example: "I\(aqve pushed an update". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3564 |
+Example: "I've pushed an update". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3565 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3566 |
(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
|
3567 |
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
|
3568 |
-\%\fBhg help update\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3569 |
+\fBhg help update\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3570 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3571 |
Example: "You should update". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3572 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3573 |
.B Working directory |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3574 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3575 |
-See \(aqDirectory, working\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3576 |
+See 'Directory, working'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3577 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3578 |
.B Working directory parent |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3579 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3580 |
-See \(aqParent, working directory\(aq. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3581 |
-.UNINDENT |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
3582 |
+See 'Parent, working directory'. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3583 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3584 |
.SH SYNTAX FOR MERCURIAL IGNORE FILES |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3585 |
.SS Synopsis |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3586 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3587 |
@@ -5063,16 +5036,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3588 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3589 |
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
|
3590 |
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
|
3591 |
-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
|
3592 |
+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
|
3593 |
configure these files. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3594 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3595 |
-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
|
3596 |
+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
|
3597 |
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
|
3598 |
-\%\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
|
3599 |
+\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
|
3600 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3601 |
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
|
3602 |
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
|
3603 |
-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
|
3604 |
+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
|
3605 |
in .hgignore. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3606 |
.SS Syntax |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3607 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3608 |
@@ -5087,13 +5060,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3609 |
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
|
3610 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3611 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3612 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3613 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3614 |
syntax: NAME |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3615 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3616 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3617 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3618 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3619 |
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
|
3620 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3621 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3622 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3623 |
.B \fBregexp\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3624 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3625 |
@@ -5102,7 +5075,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3626 |
.B \fBglob\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3627 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3628 |
Shell\-style glob. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3629 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3630 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3631 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3632 |
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
|
3633 |
follow, until another syntax is selected. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3634 |
@@ -5114,7 +5087,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3635 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3636 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3637 |
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
|
3638 |
-Please see \%\fBhg help patterns\fP\: for details. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3639 |
+Please see \fBhg help patterns\fP for details. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3640 |
.RE |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3641 |
.SS Example |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3642 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3643 |
@@ -5121,7 +5094,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3644 |
Here is an example ignore file. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3645 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3646 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3647 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3648 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3649 |
# use glob syntax. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3650 |
syntax: glob |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3651 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3652 |
@@ -5132,21 +5105,21 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3653 |
# switch to regexp syntax. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3654 |
syntax: regexp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3655 |
^\e.pc/ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3656 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3657 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3658 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3659 |
.SH CONFIGURING HGWEB |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3660 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3661 |
-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
|
3662 |
+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
|
3663 |
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
|
3664 |
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
|
3665 |
-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
|
3666 |
+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
|
3667 |
\fBhgweb.cgi\fP and \fBhgweb.fcgi\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3668 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3669 |
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
|
3670 |
but recognizes only the following sections: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3671 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3672 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3673 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3674 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3675 |
+.RS 3 |
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 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3678 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3679 |
web |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3680 |
@@ -5156,11 +5129,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3681 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3682 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3683 |
collections |
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 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3686 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3687 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3688 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3689 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3690 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3691 |
-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
|
3692 |
+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
|
3693 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3694 |
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
|
3695 |
filesystem. hgweb will not expose the filesystem directly \- only |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3696 |
@@ -5175,7 +5148,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3697 |
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
|
3698 |
recursively for repositories below that point. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3699 |
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
|
3700 |
-\fB.hg/patches\fP). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3701 |
+\fB\&.hg/patches\fP). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3702 |
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
|
3703 |
and possibly find subrepositories. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3704 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3705 |
@@ -5182,15 +5155,15 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3706 |
In this example: |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3707 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3708 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3709 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3710 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3711 |
[paths] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3712 |
/projects/a = /srv/tmprepos/a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3713 |
/projects/b = c:/repos/b |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3714 |
/ = /srv/repos/* |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3715 |
/user/bob = /home/bob/repos/** |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3716 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3717 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3718 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3719 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3720 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3721 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3722 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3723 |
The first two entries make two repositories in different directories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3724 |
@@ -5204,7 +5177,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3725 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3726 |
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
|
3727 |
and \fBhttp://server/user/bob/quux/testsubrepo/\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3728 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3729 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3730 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3731 |
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
|
3732 |
\fBpaths\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3733 |
@@ -5217,8 +5190,8 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3734 |
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
|
3735 |
made on both branches. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3736 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3737 |
-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
|
3738 |
-\%\fBhg backout\fP\: and in several extensions. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3739 |
+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
|
3740 |
+\fBhg backout\fP and in several extensions. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3741 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3742 |
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
|
3743 |
combining all non\-overlapping changes that occurred separately in |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3744 |
@@ -5243,7 +5216,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3745 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3746 |
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
|
3747 |
merge tools are: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3748 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3749 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3750 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3751 |
.B \fBinternal:dump\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3752 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3753 |
@@ -5278,7 +5251,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3754 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3755 |
Asks the user which of the local or the other version to keep as |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3756 |
the merged version. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3757 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3758 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3759 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3760 |
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
|
3761 |
not handle symlinks or binary files. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3762 |
@@ -5285,7 +5258,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3763 |
.SS Choosing a merge tool |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3764 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3765 |
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
|
3766 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3767 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3768 |
.IP 1. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3769 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3770 |
If a tool has been specified with the \-\-tool option to merge or resolve, it |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3771 |
@@ -5322,11 +5295,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3772 |
.IP 8. 3 |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3773 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3774 |
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
|
3775 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3776 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3777 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3778 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3779 |
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
|
3780 |
-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
|
3781 |
+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
|
3782 |
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
|
3783 |
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
|
3784 |
controlled by the premerge setting of the merge tool. Premerge is enabled by |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3785 |
@@ -5362,7 +5335,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3786 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3787 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3788 |
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
|
3789 |
-Please see \%\fBhg help hgignore\fP\: for details. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3790 |
+Please see \fBhg help hgignore\fP for details. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3791 |
.RE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3792 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3793 |
To use a plain path name without any pattern matching, start it with |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3794 |
@@ -5387,17 +5360,17 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3795 |
Plain examples: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3796 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3797 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3798 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3799 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3800 |
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
|
3801 |
of the repository |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3802 |
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
|
3803 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3804 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3805 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3806 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3807 |
Glob examples: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3808 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3809 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3810 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3811 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3812 |
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
|
3813 |
*.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
|
3814 |
**.c any name ending in ".c" in any subdirectory of the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3815 |
@@ -5405,27 +5378,27 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3816 |
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
|
3817 |
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
|
3818 |
including itself. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3819 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3820 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3821 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3822 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3823 |
Regexp examples: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3824 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3825 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3826 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3827 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3828 |
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
|
3829 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3830 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3831 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3832 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3833 |
File examples: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3834 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3835 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3836 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3837 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3838 |
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
|
3839 |
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
|
3840 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3841 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3842 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3843 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3844 |
-See also \%\fBhg help filesets\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3845 |
+See also \fBhg help filesets\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3846 |
.SH WORKING WITH PHASES |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3847 |
.SS What are phases? |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3848 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3849 |
@@ -5434,9 +5407,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3850 |
(for instance, with the mq or rebase extensions). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3851 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3852 |
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
|
3853 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3854 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3855 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3856 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3857 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3858 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3859 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3860 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3861 |
public : changeset is visible on a public server |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3862 |
@@ -5446,9 +5419,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3863 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3864 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3865 |
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
|
3866 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3867 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3868 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3869 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3870 |
+.RE |
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 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3873 |
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
|
3874 |
can be in a lower phase than its ancestors. For instance, if a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3875 |
@@ -5462,14 +5435,14 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3876 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3877 |
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
|
3878 |
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
|
3879 |
-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
|
3880 |
-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
|
3881 |
+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
|
3882 |
+if needed. See \fBhg help \-v phase\fP for examples. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3883 |
.SS Phases and servers |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3884 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3885 |
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
|
3886 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3887 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3888 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3889 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3890 |
\- 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
|
3891 |
public on the client |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3892 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3893 |
@@ -5477,7 +5450,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3894 |
client and server |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3895 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3896 |
\- secret changesets are neither pushed, pulled, or cloned |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3897 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3898 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3899 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3900 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3901 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3902 |
@@ -5490,13 +5463,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3903 |
repository to disable publishing in its configuration file: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3904 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3905 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3906 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3907 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3908 |
[phases] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3909 |
publish = False |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3910 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3911 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3912 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3913 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3914 |
-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
|
3915 |
+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
|
3916 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3917 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3918 |
Servers running older versions of Mercurial are treated as |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3919 |
@@ -5503,17 +5476,17 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3920 |
publishing. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3921 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3922 |
.SS Examples |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3923 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3924 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3925 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3926 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3927 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3928 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3929 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3930 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3931 |
list changesets in draft or secret phase: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3932 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3933 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3934 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3935 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3936 |
hg log \-r "not public()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3937 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3938 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3939 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3940 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3941 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3942 |
@@ -5520,9 +5493,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3943 |
change all secret changesets to draft: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3944 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3945 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3946 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3947 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3948 |
hg phase \-\-draft "secret()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3949 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3950 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3951 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3952 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3953 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3954 |
@@ -5529,9 +5502,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3955 |
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
|
3956 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3957 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3958 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3959 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3960 |
hg phase \-\-force \-\-draft . |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3961 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3962 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3963 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3964 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3965 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3966 |
@@ -5538,9 +5511,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3967 |
show a list of changeset revision and phase: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3968 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3969 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3970 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3971 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3972 |
hg log \-\-template "{rev} {phase}\en" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3973 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3974 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3975 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3976 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3977 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3978 |
@@ -5547,15 +5520,15 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3979 |
resynchronize draft changesets relative to a remote repository: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3980 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3981 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3982 |
-.ft C |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3983 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3984 |
hg phase \-fd "outgoing(URL)" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3985 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3986 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3987 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3988 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3989 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3990 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3991 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3992 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
3993 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3994 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3995 |
-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
|
3996 |
+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
|
3997 |
.SH SPECIFYING SINGLE REVISIONS |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3998 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3999 |
Mercurial supports several ways to specify individual revisions. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4000 |
@@ -5601,18 +5574,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4001 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4002 |
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
|
4003 |
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
|
4004 |
-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
|
4005 |
+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
|
4006 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4007 |
There is a single prefix operator: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4008 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4009 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4010 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4011 |
.B \fBnot x\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4012 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4013 |
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
|
4014 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4015 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4016 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4017 |
These are the supported infix operators: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4018 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4019 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4020 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4021 |
.B \fBx::y\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4022 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4023 |
@@ -5651,18 +5624,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4024 |
.B \fBx~n\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4025 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4026 |
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
|
4027 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4028 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4029 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4030 |
There is a single postfix operator: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4031 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4032 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4033 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4034 |
.B \fBx^\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4035 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4036 |
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
|
4037 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4038 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4039 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4040 |
The following predicates are supported: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4041 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4042 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4043 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4044 |
.B \fBadds(pattern)\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4045 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4046 |
@@ -5691,7 +5664,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4047 |
.B \fBbisect(string)\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4048 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4049 |
Changesets marked in the specified bisect status: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4050 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4051 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4052 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4053 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4054 |
\fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4055 |
@@ -5713,7 +5686,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4056 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4057 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4058 |
\fBcurrent\fP : the cset currently being bisected |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4059 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4060 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4061 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4062 |
.B \fBbookmark([name])\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4063 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4064 |
@@ -5758,7 +5731,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4065 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4066 |
.B \fBcontains(pattern)\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4067 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4068 |
-Revision contains a file matching pattern. See \%\fBhg help patterns\fP\: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4069 |
+Revision contains a file matching pattern. See \fBhg help patterns\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4070 |
for information about file patterns. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4071 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4072 |
.B \fBconverted([id])\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4073 |
@@ -5768,7 +5741,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4074 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4075 |
.B \fBdate(interval)\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4076 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4077 |
-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
|
4078 |
+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
|
4079 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4080 |
.B \fBdesc(string)\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4081 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4082 |
@@ -5817,7 +5790,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4083 |
Changesets connected to the specified filelog. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4084 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4085 |
For performance reasons, \fBfilelog()\fP does not show every changeset |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4086 |
-that affects the requested file(s). See \%\fBhg help log\fP\: for details. For |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4087 |
+that affects the requested file(s). See \fBhg help log\fP for details. For |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4088 |
a slower, more accurate result, use \fBfile()\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4089 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4090 |
.B \fBfirst(set, [n])\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4091 |
@@ -5826,13 +5799,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4092 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4093 |
.B \fBfollow([file])\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4094 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4095 |
-An alias for \fB::.\fP (ancestors of the working copy\(aqs first parent). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4096 |
+An alias for \fB::.\fP (ancestors of the working copy's first parent). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4097 |
If a filename is specified, the history of the given file is followed, |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4098 |
including copies. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4099 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4100 |
.B \fBgrep(regex)\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4101 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4102 |
-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
|
4103 |
+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
|
4104 |
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
|
4105 |
\fBkeyword(string)\fP, the match is case\-sensitive. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4106 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4107 |
@@ -5937,7 +5910,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4108 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4109 |
.B \fBpresent(set)\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4110 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4111 |
-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
|
4112 |
+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
|
4113 |
all revisions in set. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4114 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4115 |
If any of specified revisions is not present in the local repository, |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4116 |
@@ -5951,7 +5924,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4117 |
.B \fBremote([id [,path]])\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4118 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4119 |
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
|
4120 |
-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
|
4121 |
+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
|
4122 |
synonym for the current local branch. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4123 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4124 |
.B \fBremoves(pattern)\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4125 |
@@ -5980,7 +5953,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4126 |
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
|
4127 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4128 |
The keys can be: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4129 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4130 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4131 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4132 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4133 |
\fBrev\fP for the revision number, |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4134 |
@@ -5996,7 +5969,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4135 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4136 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4137 |
\fBdate\fP for the commit date |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4138 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4139 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4140 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4141 |
.B \fBtag([name])\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4142 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4143 |
@@ -6013,15 +5986,15 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4144 |
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
|
4145 |
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
|
4146 |
the prefix \fIliteral:\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4147 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4148 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4149 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4150 |
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
|
4151 |
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
|
4152 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4153 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4154 |
-.ft C |
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 |
<alias> = <definition> |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4157 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4158 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4159 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4160 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4161 |
in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4162 |
@@ -6031,21 +6004,21 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4163 |
For example, |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4164 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4165 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4166 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4167 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4168 |
[revsetalias] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4169 |
h = heads() |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4170 |
d($1) = sort($1, date) |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4171 |
rs($1, $2) = reverse(sort($1, $2)) |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4172 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4173 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4174 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4175 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4176 |
defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4177 |
exactly equivalent to \fBreverse(sort(0:tip, author))\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4178 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4179 |
-Command line equivalents for \%\fBhg log\fP\:: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4180 |
+Command line equivalents for \fBhg log\fP: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4181 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4182 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4183 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4184 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4185 |
\-f \-> ::. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4186 |
\-d x \-> date(x) |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4187 |
\-k x \-> keyword(x) |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4188 |
@@ -6054,19 +6027,19 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4189 |
\-b x \-> branch(x) |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4190 |
\-P x \-> !::x |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4191 |
\-l x \-> limit(expr, x) |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4192 |
-.ft P |
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 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4196 |
Some sample queries: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4197 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4198 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4199 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4200 |
. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4201 |
Changesets on the default branch: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4202 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4203 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4204 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4205 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4206 |
hg log \-r "branch(default)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4207 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4208 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4209 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4210 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4211 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4212 |
@@ -6073,9 +6046,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4213 |
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
|
4214 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4215 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4216 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4217 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4218 |
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
|
4219 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4220 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4221 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4222 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4223 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4224 |
@@ -6082,9 +6055,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4225 |
Open branch heads: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4226 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4227 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4228 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4229 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4230 |
hg log \-r "head() and not closed()" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4231 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4232 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4233 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4234 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4235 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4236 |
@@ -6092,9 +6065,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4237 |
\fBhgext/*\fP: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4238 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4239 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4240 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4241 |
-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
|
4242 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4243 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4244 |
+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
|
4245 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4246 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4247 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4248 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4249 |
@@ -6101,9 +6074,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4250 |
Changesets committed in May 2008, sorted by user: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4251 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4252 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4253 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4254 |
-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
|
4255 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4256 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4257 |
+hg log \-r "sort(date('May 2008'), user)" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4258 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4259 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4260 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4261 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4262 |
@@ -6111,11 +6084,11 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4263 |
release: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4264 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4265 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4266 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4267 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4268 |
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
|
4269 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4270 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4271 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4272 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4273 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4274 |
.SH SUBREPOSITORIES |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4275 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4276 |
Subrepositories let you nest external repositories or projects into a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4277 |
@@ -6126,7 +6099,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4278 |
subrepositories. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4279 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4280 |
Subrepositories are made of three components: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4281 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4282 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4283 |
.IP 1. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4284 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4285 |
Nested repository checkouts. They can appear anywhere in the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4286 |
@@ -6139,18 +6112,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4287 |
subrepositories are referenced like: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4288 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4289 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4290 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4291 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4292 |
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
|
4293 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4294 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4295 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4296 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4297 |
Git and Subversion subrepos are also supported: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4298 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4299 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4300 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4301 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4302 |
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
|
4303 |
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
|
4304 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4305 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4306 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4307 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4308 |
where \fBpath/to/nested\fP is the checkout location relatively to the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4309 |
@@ -6173,7 +6146,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4310 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4311 |
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
|
4312 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4313 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4314 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4315 |
.SS Adding a Subrepository |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4316 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4317 |
If \fB.hgsub\fP does not exist, create it and add it to the parent |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4318 |
@@ -6181,7 +6154,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4319 |
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
|
4320 |
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
|
4321 |
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
|
4322 |
-\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
|
4323 |
+\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
|
4324 |
.SS Synchronizing a Subrepository |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4325 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4326 |
Subrepos do not automatically track the latest changeset of their |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4327 |
@@ -6198,7 +6171,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4328 |
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
|
4329 |
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
|
4330 |
.SS Interaction with Mercurial Commands |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4331 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4332 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4333 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4334 |
.B add |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4335 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4336 |
@@ -6220,7 +6193,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4337 |
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
|
4338 |
to instead commit all modified subrepositories by specifying |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4339 |
\-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
|
4340 |
-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
|
4341 |
+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
|
4342 |
longer any modified subrepositories, it records their state and |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4343 |
finally commits it in the parent repository. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4344 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4345 |
@@ -6251,7 +6224,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4346 |
.B pull |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4347 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4348 |
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
|
4349 |
-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
|
4350 |
+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
|
4351 |
subrepositories changes referenced by the parent repository pulled |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4352 |
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
|
4353 |
case. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4354 |
@@ -6278,7 +6251,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4355 |
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
|
4356 |
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
|
4357 |
can require network access when using subrepositories. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4358 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4359 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4360 |
.SS Remapping Subrepositories Sources |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4361 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4362 |
A subrepository source location may change during a project life, |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4363 |
@@ -6302,9 +6275,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4364 |
Usage: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4365 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4366 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4367 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4368 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4369 |
$ hg log \-r1 \-\-style changelog |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4370 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4371 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4372 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4373 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4374 |
A template is a piece of text, with markup to invoke variable |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4375 |
@@ -6311,16 +6284,16 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4376 |
expansion: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4377 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4378 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4379 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4380 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4381 |
$ hg log \-r1 \-\-template "{node}\en" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4382 |
b56ce7b07c52de7d5fd79fb89701ea538af65746 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4383 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4384 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4385 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4386 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4387 |
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
|
4388 |
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
|
4389 |
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
|
4390 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4391 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4392 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4393 |
.B author |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4394 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4395 |
@@ -6406,24 +6379,24 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4396 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4397 |
.B p1node |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4398 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4399 |
-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
|
4400 |
+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
|
4401 |
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
|
4402 |
digits are 0. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4403 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4404 |
.B p1rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4405 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4406 |
-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
|
4407 |
+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
|
4408 |
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
|
4409 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4410 |
.B p2node |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4411 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4412 |
-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
|
4413 |
+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
|
4414 |
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
|
4415 |
parent, all digits are 0. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4416 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4417 |
.B p2rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4418 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4419 |
-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
|
4420 |
+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
|
4421 |
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
|
4422 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4423 |
.B parents |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4424 |
@@ -6447,24 +6420,24 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4425 |
.B tags |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4426 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4427 |
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
|
4428 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4429 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4430 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4431 |
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
|
4432 |
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
|
4433 |
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
|
4434 |
-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
|
4435 |
+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
|
4436 |
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
|
4437 |
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
|
4438 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4439 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4440 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4441 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4442 |
$ hg tip \-\-template "{date|isodate}\en" |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4443 |
2008\-08\-21 18:22 +0000 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4444 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4445 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4446 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4447 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4448 |
List of filters: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4449 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4450 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4451 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4452 |
.B addbreaks |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4453 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4454 |
@@ -6548,7 +6521,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4455 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4456 |
.B nonempty |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4457 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4458 |
-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
|
4459 |
+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
|
4460 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4461 |
.B obfuscate |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4462 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4463 |
@@ -6614,13 +6587,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4464 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4465 |
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
|
4466 |
address. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4467 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4468 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4469 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4470 |
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
|
4471 |
\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
|
4472 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4473 |
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
|
4474 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4475 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4476 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4477 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4478 |
date(date[, fmt]) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4479 |
@@ -6651,25 +6624,25 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4480 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4481 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4482 |
sub(pat, repl, expr) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4483 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4484 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4485 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4486 |
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
|
4487 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4488 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4489 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4490 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4491 |
expr % "{template}" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4492 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4493 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4494 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4495 |
Some sample command line templates: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4496 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4497 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4498 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4499 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4500 |
Format lists, e.g. files: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4501 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4502 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4503 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4504 |
-$ 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
|
4505 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4506 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4507 |
+$ 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
|
4508 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4509 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4510 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4511 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4512 |
@@ -6676,9 +6649,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4513 |
Join the list of files with a ", ": |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4514 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4515 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4516 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4517 |
-$ 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
|
4518 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4519 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4520 |
+$ 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
|
4521 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4522 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4523 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4524 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4525 |
@@ -6685,9 +6658,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4526 |
Format date: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4527 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4528 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4529 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4530 |
-$ 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
|
4531 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4532 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4533 |
+$ 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
|
4534 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4535 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4536 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4537 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4538 |
@@ -6694,9 +6667,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4539 |
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
|
4540 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4541 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4542 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4543 |
-$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4544 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4545 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4546 |
+$ hg log \-r 0 \-\-template "{fill(desc, '30')}" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4547 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4548 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4549 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4550 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4551 |
@@ -6703,10 +6676,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4552 |
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
|
4553 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4554 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4555 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4556 |
-$ 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
|
4557 |
-\(aqon branch {branch}\(aq)}\en" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4558 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4559 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4560 |
+$ 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
|
4561 |
+\&'on branch {branch}')}\en" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4562 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4563 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4564 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4565 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4566 |
@@ -6713,9 +6686,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4567 |
Append a newline if not empty: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4568 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4569 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4570 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4571 |
-$ 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
|
4572 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4573 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4574 |
+$ hg tip \-\-template "{if(author, '{author}\en')}" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4575 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4576 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4577 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4578 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4579 |
@@ -6722,9 +6695,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4580 |
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
|
4581 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4582 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4583 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4584 |
-$ 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
|
4585 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4586 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4587 |
+$ 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
|
4588 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4589 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4590 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4591 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4592 |
@@ -6731,34 +6704,34 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4593 |
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
|
4594 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4595 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4596 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4597 |
-$ 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
|
4598 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4599 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4600 |
+$ 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
|
4601 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4602 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4603 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4604 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4605 |
.SH URL PATHS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4606 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4607 |
Valid URLs are of the form: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4608 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4609 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4610 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4611 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4612 |
local/filesystem/path[#revision] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4613 |
file://local/filesystem/path[#revision] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4614 |
http://[user[:pass]@]host[:port]/[path][#revision] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4615 |
https://[user[:pass]@]host[:port]/[path][#revision] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4616 |
ssh://[user@]host[:port]/[path][#revision] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4617 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4618 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4619 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4620 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4621 |
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
|
4622 |
-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
|
4623 |
-\%\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
|
4624 |
+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
|
4625 |
+\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
|
4626 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4627 |
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
|
4628 |
-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
|
4629 |
-revisions\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4630 |
+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
|
4631 |
+revisions\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4632 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4633 |
-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
|
4634 |
+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
|
4635 |
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
|
4636 |
server. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4637 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4638 |
@@ -6766,7 +6739,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4639 |
web.cacerts. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4640 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4641 |
Some notes about using SSH with Mercurial: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4642 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4643 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4644 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4645 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4646 |
SSH requires an accessible shell account on the destination machine |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4647 |
@@ -6773,63 +6746,63 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4648 |
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
|
4649 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4650 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4651 |
-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
|
4652 |
+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
|
4653 |
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
|
4654 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4655 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4656 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4657 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4658 |
ssh://example.com//tmp/repository |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4659 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4660 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4661 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4662 |
.IP \(bu 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4663 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4664 |
-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
|
4665 |
+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
|
4666 |
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
|
4667 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4668 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4669 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4670 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4671 |
Host *.mylocalnetwork.example.com |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4672 |
Compression no |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4673 |
Host * |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4674 |
Compression yes |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4675 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4676 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4677 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4678 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4679 |
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
|
4680 |
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
|
4681 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4682 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4683 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4684 |
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
|
4685 |
aliases under the [paths] section like so: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4686 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4687 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4688 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4689 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4690 |
[paths] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4691 |
alias1 = URL1 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4692 |
alias2 = URL2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4693 |
\&... |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4694 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4695 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4696 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4697 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4698 |
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
|
4699 |
-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
|
4700 |
+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
|
4701 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4702 |
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
|
4703 |
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
|
4704 |
-.INDENT 0.0 |
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 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4707 |
.B default: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4708 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4709 |
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
|
4710 |
-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
|
4711 |
-\(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
|
4712 |
+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
|
4713 |
+\&'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
|
4714 |
pull\-like commands (including incoming and outgoing). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4715 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4716 |
.B default\-push: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4717 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4718 |
-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
|
4719 |
-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
|
4720 |
-.UNINDENT |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4721 |
+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
|
4722 |
+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
|
4723 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4724 |
.SH EXTENSIONS |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4725 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4726 |
This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4727 |
@@ -6853,7 +6826,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4728 |
distinguish them. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4729 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4730 |
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
|
4731 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4732 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4733 |
.IP 1. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4734 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4735 |
Deny list for branches (section \fBacl.deny.branches\fP) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4736 |
@@ -6866,7 +6839,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4737 |
.IP 4. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4738 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4739 |
Allow list for paths (section \fBacl.allow\fP) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4740 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4741 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4742 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4743 |
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
|
4744 |
.SS Branch\-based Access Control |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4745 |
@@ -6874,7 +6847,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4746 |
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
|
4747 |
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
|
4748 |
either: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4749 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4750 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4751 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4752 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4753 |
a branch name, or |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4754 |
@@ -6881,10 +6854,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4755 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4756 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4757 |
an asterisk, to match any branch; |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4758 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4759 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4760 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4761 |
The corresponding values can be either: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4762 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4763 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4764 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4765 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4766 |
a comma\-separated list containing users and groups, or |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4767 |
@@ -6891,7 +6864,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4768 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4769 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4770 |
an asterisk, to match anyone; |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4771 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4772 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4773 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4774 |
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
|
4775 |
of the match. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4776 |
@@ -6913,7 +6886,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4777 |
.SS Example Configuration |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4778 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4779 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4780 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4781 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4782 |
[hooks] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4783 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4784 |
# Use this if you want to check access restrictions at commit time |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4785 |
@@ -6989,12 +6962,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4786 |
src/main/resources/** = * |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4787 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4788 |
\&.hgtags = release_engineer |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4789 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4790 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4791 |
.fi |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4792 |
.SS Examples using the "!" prefix |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4793 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4794 |
-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
|
4795 |
-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
|
4796 |
+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
|
4797 |
+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
|
4798 |
be created. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4799 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4800 |
The "!" prefix allows you to prevent anyone except a given user or group to |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4801 |
@@ -7006,18 +6979,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4802 |
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
|
4803 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4804 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4805 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4806 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4807 |
[acl.allow.branches] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4808 |
# Empty |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4809 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4810 |
[acl.deny.branches] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4811 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4812 |
-# 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
|
4813 |
-# \(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
|
4814 |
+# 1) only 'gollum' can commit to branch 'ring'; |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4815 |
+# '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
|
4816 |
ring = !gollum |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4817 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4818 |
-# 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
|
4819 |
-# \(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
|
4820 |
+# 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
|
4821 |
+# '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
|
4822 |
lake = !@hobbit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4823 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4824 |
# You can also deny access based on file paths: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4825 |
@@ -7026,10 +6999,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4826 |
# Empty |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4827 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4828 |
[acl.deny] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4829 |
-# 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
|
4830 |
-# \(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
|
4831 |
+# 3) only 'gollum' can change the file below; |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4832 |
+# '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
|
4833 |
/misty/mountains/cave/ring = !gollum |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4834 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4835 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4836 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4837 |
.SS blackbox |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4838 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4839 |
@@ -7040,7 +7013,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4840 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4841 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4842 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4843 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4844 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4845 |
[blackbox] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4846 |
track = * |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4847 |
|
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4848 |
@@ -7055,26 +7028,26 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4849 |
maxsize = 1.5 MB |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4850 |
# 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
|
4851 |
maxfiles = 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4852 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4853 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4854 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4855 |
.SS Commands |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4856 |
.SS blackbox |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4857 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4858 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4859 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4860 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4861 |
hg blackbox [OPTION]... |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4862 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4863 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4864 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4865 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4866 |
view the recent repository events |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4867 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4868 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4869 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4870 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4871 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4872 |
.B \-l, \-\-limit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4873 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4874 |
the number of events to show (default: 10) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4875 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4876 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4877 |
.SS bugzilla |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
4878 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4879 |
hooks for integrating with the Bugzilla bug tracker |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4880 |
@@ -7087,7 +7060,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4881 |
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
|
4882 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4883 |
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
|
4884 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4885 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4886 |
.IP 1. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4887 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4888 |
Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4889 |
@@ -7099,7 +7072,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4890 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4891 |
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
|
4892 |
using MySQL are supported. Requires Python MySQLdb. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4893 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4894 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4895 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4896 |
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
|
4897 |
relies on a Bugzilla contrib script to send out bug change |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4898 |
@@ -7127,12 +7100,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4899 |
works on all supported Bugzilla versions. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4900 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4901 |
Configuration items common to all access modes: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4902 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4903 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4904 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4905 |
.B bugzilla.version |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4906 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4907 |
The access type to use. Values recognized are: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4908 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4909 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4910 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4911 |
.B \fBxmlrpc\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4912 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4913 |
@@ -7155,7 +7128,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4914 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4915 |
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
|
4916 |
including 2.18. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4917 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4918 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4919 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4920 |
.B bugzilla.regexp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4921 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4922 |
@@ -7200,7 +7173,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4923 |
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
|
4924 |
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
|
4925 |
extension specifies: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4926 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4927 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4928 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4929 |
.B \fB{bug}\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4930 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4931 |
@@ -7217,7 +7190,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4932 |
.B \fB{hgweb}\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4933 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4934 |
Base URL for browsing Mercurial repositories. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4935 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4936 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4937 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4938 |
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
|
4939 |
{bug}.\endetails:\en\et{desc|tabindent}\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4940 |
@@ -7234,10 +7207,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4941 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4942 |
Base URL for browsing Mercurial repositories. Referenced from |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4943 |
templates as \fB{hgweb}\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4944 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4945 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4946 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4947 |
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
|
4948 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4949 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4950 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4951 |
.B bugzilla.usermap |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4952 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4953 |
@@ -7246,13 +7219,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4954 |
line: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4955 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4956 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4957 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4958 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4959 |
committer = Bugzilla user |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4960 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4961 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4962 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4963 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4964 |
See also the \fB[usermap]\fP section. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4965 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4966 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4967 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4968 |
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
|
4969 |
committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4970 |
@@ -7259,7 +7232,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4971 |
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
|
4972 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4973 |
XMLRPC access mode configuration: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4974 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4975 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4976 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4977 |
.B bugzilla.bzurl |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4978 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4979 |
@@ -7274,22 +7247,22 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4980 |
.B bugzilla.password |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4981 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4982 |
The password for Bugzilla login. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4983 |
-.UNINDENT |
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 |
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
|
4987 |
and also: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4988 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4989 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4990 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4991 |
.B bugzilla.bzemail |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4992 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4993 |
The Bugzilla email address. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4994 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4995 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4996 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
4997 |
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
|
4998 |
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
|
4999 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5000 |
MySQL access mode configuration: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5001 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5002 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5003 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5004 |
.B bugzilla.host |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5005 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5006 |
@@ -7329,12 +7302,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5007 |
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
|
5008 |
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
|
5009 |
contrib/sendbugmail.pl %(id)s %(user)s". |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5010 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5011 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5012 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5013 |
Activating the extension: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5014 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5015 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5016 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5017 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5018 |
[extensions] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5019 |
bugzilla = |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5020 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5021 |
@@ -7341,7 +7314,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5022 |
[hooks] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5023 |
# 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
|
5024 |
incoming.bugzilla = python:hgext.bugzilla.hook |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5025 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5026 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5027 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5028 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5029 |
Example configurations: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5030 |
@@ -7353,7 +7326,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5031 |
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
|
5032 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5033 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5034 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5035 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5036 |
[bugzilla] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5037 |
bzurl=http://my\-project.org/bugzilla |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5038 |
user=bugmail@my\-project.org |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5039 |
@@ -7366,7 +7339,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5040 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5041 |
[web] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5042 |
baseurl=http://my\-project.org/hg |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5043 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5044 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5045 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5046 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5047 |
XMLRPC+email example configuration. This uses the Bugzilla at |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5048 |
@@ -7378,7 +7351,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5049 |
\fBbugzilla@my\-project.org\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5050 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5051 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5052 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5053 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5054 |
[bugzilla] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5055 |
bzurl=http://my\-project.org/bugzilla |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5056 |
user=bugmail@my\-project.org |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5057 |
@@ -7395,7 +7368,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5058 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5059 |
[usermap] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5060 |
[email protected][email protected] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5061 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5062 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5063 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5064 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5065 |
MySQL example configuration. This has a local Bugzilla 3.2 installation |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5066 |
@@ -7406,7 +7379,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5067 |
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
|
5068 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5069 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5070 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5071 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5072 |
[bugzilla] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5073 |
host=localhost |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5074 |
password=XYZZY |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5075 |
@@ -7423,35 +7396,35 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5076 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5077 |
[usermap] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5078 |
[email protected][email protected] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5079 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5080 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5081 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5082 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5083 |
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
|
5084 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5085 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5086 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5087 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5088 |
Changeset 3b16791d6642 in repository\-name. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5089 |
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
|
5090 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5091 |
Changeset commit comment. Bug 1234. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5092 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5093 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5094 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5095 |
.SS children |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5096 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5097 |
command to display child changesets (DEPRECATED) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5098 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5099 |
-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
|
5100 |
-"children(REV)"\fP\: instead. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5101 |
+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
|
5102 |
+"children(REV)"\fP instead. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5103 |
.SS Commands |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5104 |
.SS children |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5105 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5106 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5107 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5108 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5109 |
hg children [\-r REV] [FILE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5110 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5111 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5112 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5113 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5114 |
-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
|
5115 |
+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
|
5116 |
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
|
5117 |
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
|
5118 |
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
|
5119 |
@@ -7458,7 +7431,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5120 |
argument to \-\-rev if given) is printed. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5121 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5122 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5123 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5124 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5125 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5126 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5127 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5128 |
@@ -7471,7 +7444,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5129 |
.B \-\-template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5130 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5131 |
display with template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5132 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5133 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5134 |
.SS churn |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5135 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5136 |
command to display statistics about repository history |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5137 |
@@ -7479,9 +7452,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5138 |
.SS churn |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5139 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5140 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5141 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5142 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5143 |
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
|
5144 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5145 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5146 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5147 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5148 |
This command will display a histogram representing the number |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5149 |
@@ -7497,7 +7470,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5150 |
Examples: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5151 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5152 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5153 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5154 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5155 |
# 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
|
5156 |
hg churn \-t "{author|email}" |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5157 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5158 |
@@ -7509,7 +7482,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5159 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5160 |
# 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
|
5161 |
hg churn \-f "%Y" \-s |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5162 |
-.ft P |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5163 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5164 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5165 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5166 |
It is possible to map alternate email addresses to a main address |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5167 |
@@ -7516,9 +7489,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5168 |
by providing a file using the following format: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5169 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5170 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5171 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5172 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5173 |
<alias email> = <actual email> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5174 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5175 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5176 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5177 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5178 |
Such a file may be specified with the \-\-aliases option, otherwise |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5179 |
@@ -7526,7 +7499,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5180 |
Aliases will be split from the rightmost "=". |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5181 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5182 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5183 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5184 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5185 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5186 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5187 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5188 |
@@ -7567,7 +7540,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5189 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5190 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5191 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5192 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5193 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5194 |
.SS color |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5195 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5196 |
colorize output from some commands |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5197 |
@@ -7587,7 +7560,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5198 |
Default effects may be overridden from your configuration file: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5199 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5200 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5201 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5202 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5203 |
[color] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5204 |
status.modified = blue bold underline red_background |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5205 |
status.added = green bold |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5206 |
@@ -7596,7 +7569,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5207 |
status.unknown = magenta bold underline |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5208 |
status.ignored = black bold |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5209 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5210 |
-# \(aqnone\(aq turns off all effects |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5211 |
+# 'none' turns off all effects |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5212 |
status.clean = none |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5213 |
status.copied = none |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5214 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5215 |
@@ -7635,13 +7608,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5216 |
shelve.name = blue bold |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5217 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5218 |
histedit.remaining = red bold |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5219 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5220 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5221 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5222 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5223 |
-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
|
5224 |
-\(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
|
5225 |
-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
|
5226 |
-\(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
|
5227 |
+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
|
5228 |
+\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5229 |
+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
|
5230 |
+\&'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
|
5231 |
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
|
5232 |
silently ignored. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5233 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5234 |
@@ -7648,7 +7621,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5235 |
Note that on some systems, terminfo mode may cause problems when using |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5236 |
color with the pager extension and less \-R. less with the \-R option |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5237 |
will only display ECMA\-48 color codes, and terminfo mode may sometimes |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5238 |
-emit codes that less doesn\(aqt understand. You can work around this by |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5239 |
+emit codes that less doesn't understand. You can work around this by |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5240 |
either using ansi mode (or auto mode), or by using less \-r (which will |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5241 |
pass through all terminal control codes, not just color control |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5242 |
codes). |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5243 |
@@ -7658,18 +7631,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5244 |
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
|
5245 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5246 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5247 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5248 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5249 |
color.brightblue = 12 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5250 |
color.pink = 207 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5251 |
color.orange = 202 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5252 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5253 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5254 |
.fi |
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 |
-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
|
5257 |
-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
|
5258 |
-\(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
|
5259 |
+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
|
5260 |
+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
|
5261 |
+\&'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
|
5262 |
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
|
5263 |
-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
|
5264 |
+including appending '_background' to set the background to that color. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5265 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5266 |
By default, the color extension will use ANSI mode (or win32 mode on |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5267 |
Windows) if it detects a terminal. To override auto mode (to enable |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5268 |
@@ -7676,13 +7649,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5269 |
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
|
5270 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5271 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5272 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5273 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5274 |
[color] |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5275 |
mode = terminfo |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5276 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5277 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5278 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5279 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5280 |
-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
|
5281 |
+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
|
5282 |
disable color. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5283 |
.SS convert |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5284 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5285 |
@@ -7691,13 +7664,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5286 |
.SS convert |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5287 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5288 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5289 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5290 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5291 |
hg convert [OPTION]... SOURCE [DEST [REVMAP]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5292 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5293 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5294 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5295 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5296 |
Accepted source formats [identifiers]: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5297 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5298 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5299 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5300 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5301 |
Mercurial [hg] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5302 |
@@ -7725,10 +7698,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5303 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5304 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5305 |
Perforce [p4] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5306 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5307 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5308 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5309 |
Accepted destination formats [identifiers]: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5310 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5311 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5312 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5313 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5314 |
Mercurial [hg] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5315 |
@@ -7735,7 +7708,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5316 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5317 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5318 |
Subversion [svn] (history on branches is not preserved) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5319 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5320 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5321 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5322 |
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
|
5323 |
Otherwise, convert will only import up to the named revision |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5324 |
@@ -7743,12 +7716,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5325 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5326 |
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
|
5327 |
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
|
5328 |
-repository doesn\(aqt exist, it will be created. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5329 |
+repository doesn't exist, it will be created. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5330 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5331 |
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
|
5332 |
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
|
5333 |
order. Sort modes have the following effects: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5334 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5335 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5336 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5337 |
.B \-\-branchsort |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5338 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5339 |
@@ -7773,21 +7746,21 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5340 |
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
|
5341 |
to parent branches, only supported by Mercurial |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5342 |
sources. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5343 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5344 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5345 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5346 |
-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
|
5347 |
+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
|
5348 |
(\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
|
5349 |
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
|
5350 |
for that revision, like so: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5351 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5352 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5353 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5354 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5355 |
<source ID> <destination ID> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5356 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5357 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5358 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5359 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5360 |
-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
|
5361 |
-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
|
5362 |
+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
|
5363 |
+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
|
5364 |
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
|
5365 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5366 |
The authormap is a simple text file that maps each source commit |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5367 |
@@ -7796,9 +7769,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5368 |
author mapping and the line format is: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5369 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5370 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5371 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5372 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5373 |
source author = destination author |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5374 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5375 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5376 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5377 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5378 |
Empty lines and lines starting with a \fB#\fP are ignored. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5379 |
@@ -7808,13 +7781,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5380 |
directives: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5381 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5382 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5383 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5384 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5385 |
include path/to/file\-or\-dir |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5386 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5387 |
exclude path/to/file\-or\-dir |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5388 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5389 |
rename path/to/source path/to/destination |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5390 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5391 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5392 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5393 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5394 |
Comment lines start with \fB#\fP. A specified path matches if it |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5395 |
@@ -7838,9 +7811,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5396 |
comma\-separated values: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5397 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5398 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5399 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5400 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5401 |
key parent1, parent2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5402 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5403 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5404 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5405 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5406 |
The key is the revision ID in the source |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5407 |
@@ -7860,9 +7833,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5408 |
lines of the form: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5409 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5410 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5411 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5412 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5413 |
original_branch_name new_branch_name |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5414 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5415 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5416 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5417 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5418 |
where "original_branch_name" is the name of the branch in the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5419 |
@@ -7874,7 +7847,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5420 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5421 |
The Mercurial source recognizes the following configuration |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5422 |
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
|
5423 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5424 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5425 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5426 |
.B convert.hg.ignoreerrors |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5427 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5428 |
@@ -7891,7 +7864,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5429 |
.B convert.hg.revs |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5430 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5431 |
revset specifying the source revisions to convert. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5432 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5433 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5434 |
.SS CVS Source |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5435 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5436 |
CVS source will use a sandbox (i.e. a checked\-out copy) from CVS |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5437 |
@@ -7905,7 +7878,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5438 |
sandbox is ignored. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5439 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5440 |
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
|
5441 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5442 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5443 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5444 |
.B convert.cvsps.cache |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5445 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5446 |
@@ -7956,7 +7929,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5447 |
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
|
5448 |
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
|
5449 |
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
|
5450 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5451 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5452 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5453 |
An additional "debugcvsps" Mercurial command allows the builtin |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5454 |
changeset merging code to be run without doing a conversion. Its |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5455 |
@@ -7976,7 +7949,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5456 |
detection. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5457 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5458 |
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
|
5459 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5460 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5461 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5462 |
.B convert.svn.branches |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5463 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5464 |
@@ -7998,18 +7971,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5465 |
use local time (as determined by the TZ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5466 |
environment variable) for changeset date/times. The default |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5467 |
is False (use UTC). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5468 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5469 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5470 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5471 |
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
|
5472 |
instead of being integrally converted. Only single branch |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5473 |
conversions are supported. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5474 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5475 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5476 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5477 |
.B convert.svn.startrev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5478 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5479 |
specify start Subversion revision number. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5480 |
The default is 0. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5481 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5482 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5483 |
.SS Perforce Source |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5484 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5485 |
The Perforce (P4) importer can be given a p4 depot path or a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5486 |
@@ -8021,17 +7994,17 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5487 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5488 |
It is possible to limit the amount of source history to be |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5489 |
converted by specifying an initial Perforce revision: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5490 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5491 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5492 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5493 |
.B convert.p4.startrev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5494 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5495 |
specify initial Perforce revision (a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5496 |
Perforce changelist number). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5497 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5498 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5499 |
.SS Mercurial Destination |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5500 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5501 |
The following options are supported: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5502 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5503 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5504 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5505 |
.B convert.hg.clonebranches |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5506 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5507 |
@@ -8047,10 +8020,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5508 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5509 |
preserve branch names. The default is |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5510 |
True. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5511 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5512 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5513 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5514 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5515 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5516 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5517 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5518 |
.B \-\-authors |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5519 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5520 |
@@ -8099,7 +8072,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5521 |
.B \-\-closesort |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5522 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5523 |
try to reorder closed revisions |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5524 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5525 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5526 |
.SS eol |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5527 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5528 |
automatically manage newlines in repository files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5529 |
@@ -8111,7 +8084,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5530 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5531 |
The extension reads its configuration from a versioned \fB.hgeol\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5532 |
configuration file found in the root of the working copy. The |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5533 |
-\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
|
5534 |
+\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
|
5535 |
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
|
5536 |
\fB[repository]\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5537 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5538 |
@@ -8124,9 +8097,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5539 |
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
|
5540 |
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
|
5541 |
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
|
5542 |
-\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
|
5543 |
+\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
|
5544 |
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
|
5545 |
-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
|
5546 |
+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5547 |
default behaviour; it is only needed if you need to override a later, |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5548 |
more general pattern. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5549 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5550 |
@@ -8143,7 +8116,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5551 |
Example versioned \fB.hgeol\fP file: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5552 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5553 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5554 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5555 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5556 |
[patterns] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5557 |
**.py = native |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5558 |
**.vcproj = CRLF |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5559 |
@@ -8153,7 +8126,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5560 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5561 |
[repository] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5562 |
native = LF |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5563 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5564 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5565 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5566 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5567 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5568 |
@@ -8165,12 +8138,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5569 |
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
|
5570 |
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
|
5571 |
overall behavior. There are three settings: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5572 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5573 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5574 |
.IP \(bu 2 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5575 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5576 |
\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
|
5577 |
\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
|
5578 |
-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
|
5579 |
+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
|
5580 |
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
|
5581 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5582 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5583 |
@@ -8184,7 +8157,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5584 |
\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
|
5585 |
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
|
5586 |
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
|
5587 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5588 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5589 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5590 |
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
|
5591 |
like the deprecated win32text extension does. This means that you can |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5592 |
@@ -8200,7 +8173,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5593 |
\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
|
5594 |
\fBpretxnchangegroup\fP hooks. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5595 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5596 |
-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
|
5597 |
+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
|
5598 |
used. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5599 |
.SS extdiff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5600 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5601 |
@@ -8213,12 +8186,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5602 |
files to compare. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5603 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5604 |
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
|
5605 |
-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
|
5606 |
+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
|
5607 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5608 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5609 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5610 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5611 |
[extdiff] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5612 |
-# 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
|
5613 |
+# 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
|
5614 |
cdiff = gdiff \-Nprc5 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5615 |
## or the old way: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5616 |
#cmd.cdiff = gdiff |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5617 |
@@ -8235,20 +8208,20 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5618 |
# 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
|
5619 |
# your .vimrc |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5620 |
vimdiff = gvim \-f "+next" \e |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5621 |
- "+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
|
5622 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5623 |
+ "+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
|
5624 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5625 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5626 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5627 |
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
|
5628 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5629 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5630 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5631 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5632 |
$parent1, $plabel1 \- filename, descriptive label of first parent |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5633 |
$child, $clabel \- filename, descriptive label of child revision |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5634 |
$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
|
5635 |
$root \- repository root |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5636 |
$parent is an alias for $parent1. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5637 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5638 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5639 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5640 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5641 |
The extdiff extension will look in your [diff\-tools] and [merge\-tools] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5642 |
@@ -8255,17 +8228,17 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5643 |
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
|
5644 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5645 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5646 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5647 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5648 |
[extdiff] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5649 |
kdiff3 = |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5650 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5651 |
[diff\-tools] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5652 |
-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
|
5653 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5654 |
+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5655 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5656 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5657 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5658 |
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
|
5659 |
-\%\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
|
5660 |
+\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
|
5661 |
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
|
5662 |
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
|
5663 |
.SS Commands |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5664 |
@@ -8272,9 +8245,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5665 |
.SS extdiff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5666 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5667 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5668 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5669 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5670 |
hg extdiff [OPT]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5671 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5672 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5673 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5674 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5675 |
Show differences between revisions for the specified files, using |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5676 |
@@ -8293,7 +8266,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5677 |
to its parent. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5678 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5679 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5680 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5681 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5682 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5683 |
.B \-p, \-\-program |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5684 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5685 |
@@ -8318,7 +8291,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5686 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5687 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5688 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5689 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5690 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5691 |
.SS factotum |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5692 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5693 |
http authentication with factotum |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5694 |
@@ -8332,9 +8305,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5695 |
By default, keys are specified as: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5696 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5697 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5698 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5699 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5700 |
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
|
5701 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5702 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5703 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5704 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5705 |
If the factotum extension is unable to read the required key, one will be |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5706 |
@@ -8344,12 +8317,12 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5707 |
default, these entries are: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5708 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5709 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5710 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5711 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5712 |
[factotum] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5713 |
executable = /bin/auth/factotum |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5714 |
mountpoint = /mnt/factotum |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5715 |
service = hg |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5716 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5717 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5718 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5719 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5720 |
The executable entry defines the full path to the factotum binary. The |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5721 |
@@ -8362,9 +8335,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5722 |
.SS fetch |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5723 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5724 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5725 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5726 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5727 |
hg fetch [SOURCE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5728 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5729 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5730 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5731 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5732 |
This finds all changes from the repository at the specified path |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5733 |
@@ -8379,12 +8352,12 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5734 |
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
|
5735 |
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
|
5736 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5737 |
-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
|
5738 |
+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
|
5739 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5740 |
Returns 0 on success. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5741 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5742 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5743 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5744 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5745 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5746 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5747 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5748 |
@@ -8429,7 +8402,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5749 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5750 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5751 |
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
|
5752 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5753 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5754 |
.SS gpg |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5755 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5756 |
commands to sign and verify changesets |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5757 |
@@ -8437,9 +8410,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5758 |
.SS sigcheck |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5759 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5760 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5761 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5762 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5763 |
hg sigcheck REV |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5764 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5765 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5766 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5767 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5768 |
verify all the signatures there may be for a particular revision |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5769 |
@@ -8446,18 +8419,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5770 |
.SS sign |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5771 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5772 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5773 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5774 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5775 |
hg sign [OPTION]... [REV]... |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5776 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5777 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5778 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5779 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5780 |
If no revision is given, the parent of the working directory is used, |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5781 |
or tip if no revision is checked out. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5782 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5783 |
-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
|
5784 |
+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
|
5785 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5786 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5787 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5788 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5789 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5790 |
.B \-l, \-\-local |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5791 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5792 |
@@ -8486,13 +8459,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5793 |
.B \-u, \-\-user |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5794 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5795 |
record the specified user as committer |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5796 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5797 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5798 |
.SS sigs |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5799 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5800 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5801 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5802 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5803 |
hg sigs |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5804 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5805 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5806 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5807 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5808 |
list signed changesets |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5809 |
@@ -8507,9 +8480,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5810 |
.SS glog |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5811 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5812 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5813 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5814 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5815 |
hg glog [OPTION]... [FILE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5816 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5817 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5818 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5819 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5820 |
Print a revision history alongside a revision graph drawn with |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5821 |
@@ -8519,7 +8492,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5822 |
directory. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5823 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5824 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5825 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5826 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5827 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5828 |
.B \-f, \-\-follow |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5829 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5830 |
@@ -8608,7 +8581,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5831 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5832 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5833 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5834 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5835 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5836 |
.SS hgcia |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5837 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5838 |
hooks for integrating with the CIA.vc notification service |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5839 |
@@ -8617,7 +8590,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5840 |
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
|
5841 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5842 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5843 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5844 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5845 |
[cia] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5846 |
# your registered CIA user name |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5847 |
user = foo |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5848 |
@@ -8649,7 +8622,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5849 |
[web] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5850 |
# If you want hyperlinks (optional) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5851 |
baseurl = http://server/path/to/repo |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5852 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5853 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5854 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5855 |
.SS hgk |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5856 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5857 |
@@ -8661,19 +8634,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5858 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5859 |
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
|
5860 |
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
|
5861 |
-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
|
5862 |
-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
|
5863 |
-repository, and needs to be enabled. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5864 |
+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
|
5865 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5866 |
-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
|
5867 |
-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
|
5868 |
-the path to hgk in your configuration file: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5869 |
+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
|
5870 |
+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
|
5871 |
+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
|
5872 |
+file: |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5873 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5874 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5875 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5876 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5877 |
[hgk] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5878 |
path=/location/of/hgk |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5879 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5880 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5881 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5882 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5883 |
hgk can make use of the extdiff extension to visualize revisions. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5884 |
@@ -8680,10 +8652,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5885 |
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
|
5886 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5887 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5888 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5889 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5890 |
[hgk] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5891 |
vdiff=vdiff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5892 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5893 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5894 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5895 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5896 |
Revisions context menu will now display additional entries to fire |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5897 |
@@ -8692,37 +8664,37 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5898 |
.SS view |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5899 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5900 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5901 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5902 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5903 |
hg view [\-l LIMIT] [REVRANGE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5904 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5905 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5906 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5907 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5908 |
start interactive history viewer |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5909 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5910 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5911 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5912 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5913 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5914 |
.B \-l, \-\-limit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5915 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5916 |
limit number of changes displayed |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5917 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5918 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5919 |
.SS highlight |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5920 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5921 |
syntax highlighting for hgweb (requires Pygments) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5922 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5923 |
It depends on the Pygments syntax highlighting library: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5924 |
-\%http://pygments.org/\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5925 |
+http://pygments.org/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5926 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5927 |
There is a single configuration option: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5928 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5929 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5930 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5931 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5932 |
[web] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5933 |
pygments_style = <style> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5934 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5935 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5936 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5937 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5938 |
-The default is \(aqcolorful\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
5939 |
+The default is 'colorful'. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5940 |
.SS histedit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5941 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5942 |
interactive history editing |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5943 |
@@ -8731,7 +8703,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5944 |
is as follows, assuming the following history: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5945 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5946 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5947 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5948 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5949 |
@ 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
|
5950 |
| Add delta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5951 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5952 |
@@ -8743,7 +8715,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5953 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5954 |
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
|
5955 |
Add alpha |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5956 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5957 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5958 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5959 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5960 |
If you were to run \fBhg histedit c561b4e977df\fP, you would see the following |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5961 |
@@ -8750,7 +8722,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5962 |
file open in your editor: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5963 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5964 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5965 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5966 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5967 |
pick c561b4e977df Add beta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5968 |
pick 030b686bedc4 Add gamma |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5969 |
pick 7c2fd3b9020c Add delta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5970 |
@@ -8764,7 +8736,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5971 |
# d, drop = remove commit from history |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5972 |
# m, mess = edit message without changing commit content |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5973 |
# |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5974 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5975 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5976 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5977 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5978 |
In this file, lines beginning with \fB#\fP are ignored. You must specify a rule |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5979 |
@@ -8773,7 +8745,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5980 |
would reorganize the file to look like this: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5981 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5982 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5983 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5984 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5985 |
pick 030b686bedc4 Add gamma |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5986 |
pick c561b4e977df Add beta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5987 |
fold 7c2fd3b9020c Add delta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5988 |
@@ -8787,7 +8759,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5989 |
# d, drop = remove commit from history |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5990 |
# m, mess = edit message without changing commit content |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5991 |
# |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5992 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5993 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5994 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5995 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5996 |
At which point you close the editor and \fBhistedit\fP starts working. When you |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5997 |
@@ -8795,21 +8767,21 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
5998 |
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
|
5999 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6000 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6001 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6002 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6003 |
Add beta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6004 |
*** |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6005 |
Add delta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6006 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6007 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6008 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6009 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6010 |
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
|
6011 |
-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
|
6012 |
+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
|
6013 |
\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
|
6014 |
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
|
6015 |
like this: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6016 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6017 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6018 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6019 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6020 |
@ 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
|
6021 |
| Add beta and delta. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6022 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6023 |
@@ -8818,12 +8790,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6024 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6025 |
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
|
6026 |
Add alpha |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6027 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6028 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6029 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6030 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6031 |
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
|
6032 |
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
|
6033 |
-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
|
6034 |
+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
|
6035 |
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
|
6036 |
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
|
6037 |
revisions by passing the \fB\-\-keep\fP flag. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6038 |
@@ -8830,20 +8802,20 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6039 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6040 |
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
|
6041 |
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
|
6042 |
-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
|
6043 |
+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
|
6044 |
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
|
6045 |
-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
|
6046 |
+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
|
6047 |
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
|
6048 |
original message for the \fBedit\fP ed revision. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6049 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6050 |
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
|
6051 |
-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
|
6052 |
+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
|
6053 |
\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
|
6054 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6055 |
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
|
6056 |
-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
|
6057 |
-\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
|
6058 |
-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
|
6059 |
+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
|
6060 |
+\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
|
6061 |
+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
|
6062 |
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
|
6063 |
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
|
6064 |
have made and return to the state before you attempted to edit your |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6065 |
@@ -8853,7 +8825,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6066 |
changes, such that we have the following history: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6067 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6068 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6069 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6070 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6071 |
@ 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
|
6072 |
| Add theta |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6073 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6074 |
@@ -8874,7 +8846,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6075 |
| |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6076 |
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
|
6077 |
Add alpha |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6078 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6079 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6080 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6081 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6082 |
If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6083 |
@@ -8885,9 +8857,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6084 |
.SS histedit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6085 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6086 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6087 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6088 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6089 |
hg histedit ANCESTOR | \-\-outgoing [URL] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6090 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6091 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6092 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6093 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6094 |
This command edits changesets between ANCESTOR and the parent of |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6095 |
@@ -8895,7 +8867,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6096 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6097 |
With \-\-outgoing, this edits changesets not found in the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6098 |
destination repository. If URL of the destination is omitted, the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6099 |
-\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6100 |
+\&'default\-push' (or 'default') path will be used. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6101 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6102 |
For safety, this command is aborted, also if there are ambiguous |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6103 |
outgoing revisions which may confuse users: for example, there are |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6104 |
@@ -8903,7 +8875,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6105 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6106 |
Use "min(outgoing() and ::.)" or similar revset specification |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6107 |
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
|
6108 |
-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
|
6109 |
+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
|
6110 |
selecting revisions. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6111 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6112 |
Returns 0 on success, 1 if user intervention is required (not only |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6113 |
@@ -8911,7 +8883,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6114 |
conflicts). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6115 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6116 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6117 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6118 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6119 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6120 |
.B \-\-commands |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6121 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6122 |
@@ -8923,7 +8895,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6123 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6124 |
.B \-k, \-\-keep |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6125 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6126 |
-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
|
6127 |
+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
|
6128 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6129 |
.B \-\-abort |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6130 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6131 |
@@ -8940,23 +8912,23 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6132 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6133 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6134 |
first revision to be edited |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6135 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6136 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6137 |
.SS inotify |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6138 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6139 |
-accelerate status report using Linux\(aqs inotify service |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6140 |
+accelerate status report using Linux's inotify service |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6141 |
.SS Commands |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6142 |
.SS inserve |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6143 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6144 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6145 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6146 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6147 |
hg inserve [OPTION]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6148 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6149 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6150 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6151 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6152 |
start an inotify server for this repository |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6153 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6154 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6155 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6156 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6157 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6158 |
.B \-d, \-\-daemon |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6159 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6160 |
@@ -8973,7 +8945,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6161 |
.B \-\-pid\-file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6162 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6163 |
name of file to write process ID to |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6164 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6165 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6166 |
.SS interhg |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6167 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6168 |
None |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6169 |
@@ -8997,7 +8969,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6170 |
Example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6171 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6172 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6173 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6174 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6175 |
[keyword] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6176 |
# 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
|
6177 |
**.py = |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6178 |
@@ -9006,7 +8978,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6179 |
[keywordset] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6180 |
# prefer svn\- over cvs\-like default keywordmaps |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6181 |
svn = True |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6182 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6183 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6184 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6185 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6186 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6187 |
@@ -9015,11 +8987,11 @@ |
99
c15c9099bb44
6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6188 |
.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6189 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6190 |
For [keywordmaps] template mapping and expansion demonstration and |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6191 |
-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
|
6192 |
+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
|
6193 |
available templates and filters. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6194 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6195 |
Three additional date template filters are provided: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6196 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6197 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6198 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6199 |
.B \fButcdate\fP |
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 |
@@ -9032,28 +9004,28 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6202 |
.B \fBsvnisodate\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6203 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6204 |
"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
|
6205 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6206 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6207 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6208 |
-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
|
6209 |
+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
|
6210 |
replaced with customized keywords and templates. Again, run |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6211 |
-\%\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
|
6212 |
+\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
|
6213 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6214 |
-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
|
6215 |
+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
|
6216 |
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
|
6217 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6218 |
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
|
6219 |
-\%\fBhg kwexpand\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6220 |
+\fBhg kwexpand\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6221 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6222 |
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
|
6223 |
-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
|
6224 |
+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
|
6225 |
{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
|
6226 |
.SS Commands |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6227 |
.SS kwdemo |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6228 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6229 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6230 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6231 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6232 |
hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6233 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6234 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6235 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6236 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6237 |
Show current, custom, or default keyword template maps and their |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6238 |
@@ -9064,10 +9036,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6239 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6240 |
Use \-d/\-\-default to disable current configuration. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6241 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6242 |
-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
|
6243 |
+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
|
6244 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6245 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6246 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6247 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6248 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6249 |
.B \-d, \-\-default |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6250 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6251 |
@@ -9076,13 +9048,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6252 |
.B \-f, \-\-rcfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6253 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6254 |
read maps from rcfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6255 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6256 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6257 |
.SS kwexpand |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6258 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6259 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6260 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6261 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6262 |
hg kwexpand [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6263 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6264 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6265 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6266 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6267 |
Run after (re)enabling keyword expansion. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6268 |
@@ -9090,7 +9062,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6269 |
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
|
6270 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6271 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6272 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6273 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6274 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6275 |
.B \-I, \-\-include |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6276 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6277 |
@@ -9099,13 +9071,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6278 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6279 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6280 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6281 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6282 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6283 |
.SS kwfiles |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6284 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6285 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6286 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6287 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6288 |
hg kwfiles [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6289 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6290 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6291 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6292 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6293 |
List which files in the working directory are matched by the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6294 |
@@ -9115,7 +9087,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6295 |
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
|
6296 |
expansion. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6297 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6298 |
-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
|
6299 |
+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
|
6300 |
inclusion and exclusion of files. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6301 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6302 |
With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6303 |
@@ -9122,16 +9094,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6304 |
of files are: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6305 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6306 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6307 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6308 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6309 |
K = keyword expansion candidate |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6310 |
k = keyword expansion candidate (not tracked) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6311 |
I = ignored |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6312 |
i = ignored (not tracked) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6313 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6314 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6315 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6316 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6317 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6318 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6319 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6320 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6321 |
.B \-A, \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6322 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6323 |
@@ -9152,13 +9124,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6324 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6325 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6326 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6327 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6328 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6329 |
.SS kwshrink |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6330 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6331 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6332 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6333 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6334 |
hg kwshrink [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6335 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6336 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6337 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6338 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6339 |
Must be run before changing/disabling active keywords. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6340 |
@@ -9166,7 +9138,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6341 |
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
|
6342 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6343 |
Options: |
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 \-I, \-\-include |
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 |
@@ -9175,7 +9147,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6350 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6351 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6352 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6353 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6354 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6355 |
.SS largefiles |
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 |
track large binary files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6358 |
@@ -9182,10 +9154,10 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6359 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6360 |
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
|
6361 |
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
|
6362 |
-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
|
6363 |
+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
|
6364 |
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
|
6365 |
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
|
6366 |
-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
|
6367 |
+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
|
6368 |
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
|
6369 |
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
|
6370 |
somewhere, and you only fetch the revisions that you need when you |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6371 |
@@ -9197,18 +9169,18 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6372 |
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
|
6373 |
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
|
6374 |
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
|
6375 |
-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
|
6376 |
+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
|
6377 |
of large files when you clone or pull. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6378 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6379 |
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
|
6380 |
-\-\-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
|
6381 |
+\-\-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
|
6382 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6383 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6384 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6385 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6386 |
$ dd if=/dev/urandom of=randomdata count=2000 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6387 |
$ hg add \-\-large randomdata |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6388 |
-$ 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
|
6389 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6390 |
+$ hg commit \-m 'add randomdata as a largefile' |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6391 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6392 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6393 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6394 |
When you push a changeset that adds/modifies largefiles to a remote |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6395 |
@@ -9225,8 +9197,8 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6396 |
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
|
6397 |
largefiles). |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6398 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6399 |
-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
|
6400 |
-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
|
6401 |
+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
|
6402 |
+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
|
6403 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6404 |
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
|
6405 |
download all the largefiles that correspond to the new changesets at |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6406 |
@@ -9245,12 +9217,12 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6407 |
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
|
6408 |
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
|
6409 |
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
|
6410 |
-\%\fBhg lfconvert\fP\: command: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6411 |
+\fBhg lfconvert\fP command: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6412 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6413 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6414 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6415 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6416 |
$ hg lfconvert \-\-size 10 oldrepo newrepo |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6417 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6418 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6419 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6420 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6421 |
In repositories that already have largefiles in them, any new file |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6422 |
@@ -9260,20 +9232,20 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6423 |
\-\-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
|
6424 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6425 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6426 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6427 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6428 |
[largefiles] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6429 |
minsize = 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6430 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6431 |
$ hg add \-\-lfsize 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6432 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6433 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6434 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6435 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6436 |
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
|
6437 |
-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
|
6438 |
+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
|
6439 |
tracked as largefiles: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6440 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6441 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6442 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6443 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6444 |
[largefiles] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6445 |
patterns = |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6446 |
*.jpg |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6447 |
@@ -9280,7 +9252,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6448 |
re:.*\e.(png|bmp)$ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6449 |
library.zip |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6450 |
content/audio/* |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6451 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6452 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6453 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6454 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6455 |
Files that match one of these patterns will be added as largefiles |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6456 |
@@ -9289,15 +9261,15 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6457 |
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
|
6458 |
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
|
6459 |
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
|
6460 |
-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
|
6461 |
+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
|
6462 |
command. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6463 |
.SS Commands |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6464 |
.SS lfconvert |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6465 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6466 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6467 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6468 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6469 |
hg lfconvert SOURCE DEST [FILE ...] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6470 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6471 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6472 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6473 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6474 |
Convert repository SOURCE to a new repository DEST, identical to |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6475 |
@@ -9317,7 +9289,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6476 |
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
|
6477 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6478 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6479 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6480 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6481 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6482 |
.B \-s, \-\-size |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6483 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6484 |
@@ -9326,31 +9298,31 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6485 |
.B \-\-to\-normal |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6486 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6487 |
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
|
6488 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6489 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6490 |
.SS lfpull |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6491 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6492 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6493 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6494 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6495 |
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
|
6496 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6497 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6498 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6499 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6500 |
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
|
6501 |
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
|
6502 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6503 |
-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
|
6504 |
-See \%\fBhg help urls\fP\: for more information. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6505 |
+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
|
6506 |
+See \fBhg help urls\fP for more information. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6507 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6508 |
Some examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6509 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6510 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6511 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6512 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6513 |
pull largefiles for all branch heads: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6514 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6515 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6516 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6517 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6518 |
hg lfpull \-r "head() and not closed()" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6519 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6520 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6521 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6522 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6523 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6524 |
@@ -9357,14 +9329,14 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6525 |
pull largefiles on the default branch: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6526 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6527 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6528 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6529 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6530 |
hg lfpull \-r "branch(default)" |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6531 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6532 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6533 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6534 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6535 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6536 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6537 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6538 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6539 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6540 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6541 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6542 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6543 |
@@ -9381,7 +9353,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6544 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6545 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6546 |
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
|
6547 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6548 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6549 |
.SS mq |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6550 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6551 |
manage a stack of patches |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6552 |
@@ -9393,10 +9365,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6553 |
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
|
6554 |
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
|
6555 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6556 |
-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
|
6557 |
+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
|
6558 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6559 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6560 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6561 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6562 |
create new patch qnew |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6563 |
import existing patch qimport |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6564 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6565 |
@@ -9406,7 +9378,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6566 |
add known patch to applied stack qpush |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6567 |
remove patch from applied stack qpop |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6568 |
refresh contents of top applied patch qrefresh |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6569 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6570 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6571 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6572 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6573 |
By default, mq will automatically use git patches when required to |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6574 |
@@ -9414,29 +9386,29 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6575 |
files creations or deletions. This behaviour can be configured with: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6576 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6577 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6578 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6579 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6580 |
[mq] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6581 |
git = auto/keep/yes/no |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6582 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6583 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6584 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6585 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6586 |
-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
|
6587 |
-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
|
6588 |
-\(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
|
6589 |
+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
|
6590 |
+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
|
6591 |
+\&'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
|
6592 |
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
|
6593 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6594 |
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
|
6595 |
-\%\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
|
6596 |
+\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
|
6597 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6598 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6599 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6600 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6601 |
[mq] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6602 |
secret = True |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6603 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6604 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6605 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6606 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6607 |
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
|
6608 |
-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
|
6609 |
+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
|
6610 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6611 |
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
|
6612 |
qgoto abort immediately. If \-f/\-\-force is used, the changes are |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6613 |
@@ -9443,10 +9415,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6614 |
discarded. Setting: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6615 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6616 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6617 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6618 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6619 |
[mq] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6620 |
keepchanges = True |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6621 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6622 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6623 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6624 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6625 |
make them behave as if \-\-keep\-changes were passed, and non\-conflicting |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6626 |
@@ -9459,15 +9431,15 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6627 |
.SS qapplied |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6628 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6629 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6630 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6631 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6632 |
hg qapplied [\-1] [\-s] [PATCH] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6633 |
-.ft P |
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 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6636 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6637 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6638 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6639 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6640 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6641 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6642 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6643 |
.B \-1, \-\-last |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6644 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6645 |
@@ -9476,13 +9448,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6646 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6647 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6648 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6649 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6650 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6651 |
.SS qclone |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6652 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6653 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6654 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6655 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6656 |
hg qclone [OPTION]... SOURCE [DEST] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6657 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6658 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6659 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6660 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6661 |
If source is local, destination will have no patches applied. If |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6662 |
@@ -9495,12 +9467,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6663 |
default. Use \-p <url> to change. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6664 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6665 |
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
|
6666 |
-would be created by \%\fBhg init \-\-mq\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6667 |
+would be created by \fBhg init \-\-mq\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6668 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6669 |
Return 0 on success. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6670 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6671 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6672 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6673 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6674 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6675 |
.B \-\-pull |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6676 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6677 |
@@ -9529,19 +9501,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6678 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6679 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6680 |
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
|
6681 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6682 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6683 |
.SS qcommit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6684 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6685 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6686 |
-.ft C |
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 |
hg qcommit [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6689 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6690 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6691 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6692 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6693 |
-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
|
6694 |
+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
|
6695 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6696 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6697 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6698 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6699 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6700 |
.B \-A, \-\-addremove |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6701 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6702 |
@@ -9588,13 +9560,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6703 |
recurse into subrepositories |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6704 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6705 |
aliases: qci |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6706 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6707 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6708 |
.SS qdelete |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6709 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6710 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6711 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6712 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6713 |
hg qdelete [\-k] [PATCH]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6714 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6715 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6716 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6717 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6718 |
The patches must not be applied, and at least one patch is required. Exact |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6719 |
@@ -9602,10 +9574,10 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6720 |
preserved in the patch directory. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6721 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6722 |
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
|
6723 |
-use the \%\fBhg qfinish\fP\: command. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6724 |
+use the \fBhg qfinish\fP command. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6725 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6726 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6727 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6728 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6729 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6730 |
.B \-k, \-\-keep |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6731 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6732 |
@@ -9616,13 +9588,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6733 |
stop managing a revision (DEPRECATED) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6734 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6735 |
aliases: qremove qrm |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6736 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6737 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6738 |
.SS qdiff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6739 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6740 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6741 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6742 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6743 |
hg qdiff [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6744 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6745 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6746 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6747 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6748 |
Shows a diff which includes the current patch as well as any |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6749 |
@@ -9630,8 +9602,8 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6750 |
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
|
6751 |
after a qrefresh). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6752 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6753 |
-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
|
6754 |
-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
|
6755 |
+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
|
6756 |
+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
|
6757 |
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
|
6758 |
qrefresh. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6759 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6760 |
@@ -9638,7 +9610,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6761 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6762 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6763 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6764 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6765 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6766 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6767 |
.B \-a, \-\-text |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6768 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6769 |
@@ -9687,13 +9659,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6770 |
.B \-X, \-\-exclude |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6771 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6772 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6773 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6774 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6775 |
.SS qfinish |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6776 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6777 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6778 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6779 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6780 |
hg qfinish [\-a] [REV]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6781 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6782 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6783 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6784 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6785 |
Finishes the specified revisions (corresponding to applied |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6786 |
@@ -9712,18 +9684,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6787 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6788 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6789 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6790 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6791 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6792 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6793 |
.B \-a, \-\-applied |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6794 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6795 |
finish all applied changesets |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6796 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6797 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6798 |
.SS qfold |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6799 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6800 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6801 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6802 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6803 |
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
|
6804 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6805 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6806 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6807 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6808 |
Patches must not yet be applied. Each patch will be successively |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6809 |
@@ -9739,7 +9711,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6810 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6811 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6812 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6813 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6814 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6815 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6816 |
.B \-e, \-\-edit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6817 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6818 |
@@ -9756,19 +9728,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6819 |
.B \-l, \-\-logfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6820 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6821 |
read commit message from file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6822 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6823 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6824 |
.SS qgoto |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6825 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6826 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6827 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6828 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6829 |
hg qgoto [OPTION]... PATCH |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6830 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6831 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6832 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6833 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6834 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6835 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6836 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6837 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6838 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6839 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6840 |
.B \-\-keep\-changes |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6841 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6842 |
@@ -9781,19 +9753,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6843 |
.B \-\-no\-backup |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6844 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6845 |
do not save backup copies of files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6846 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6847 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6848 |
.SS qguard |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6849 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6850 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6851 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6852 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6853 |
hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6854 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6855 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6856 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6857 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6858 |
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
|
6859 |
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
|
6860 |
-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
|
6861 |
-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
|
6862 |
+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
|
6863 |
+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
|
6864 |
has activated it. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6865 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6866 |
With no arguments, print the currently active guards. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6867 |
@@ -9800,21 +9772,21 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6868 |
With arguments, set guards for the named patch. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6869 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6870 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6871 |
-Specifying negative guards now requires \(aq\-\-\(aq. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6872 |
+Specifying negative guards now requires '\-\-'. |
99
c15c9099bb44
6841644 OpenSolaris Python should support gdbm
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6873 |
.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6874 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6875 |
To set guards on another patch: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6876 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6877 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6878 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6879 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6880 |
hg qguard other.patch \-\- +2.6.17 \-stable |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6881 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6882 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6883 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6884 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6885 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6886 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6887 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6888 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6889 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6890 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6891 |
.B \-l, \-\-list |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6892 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6893 |
@@ -9823,13 +9795,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6894 |
.B \-n, \-\-none |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6895 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6896 |
drop all guards |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6897 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6898 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6899 |
.SS qheader |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6900 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6901 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6902 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6903 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6904 |
hg qheader [PATCH] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6905 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6906 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6907 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6908 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6909 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6910 |
@@ -9836,9 +9808,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6911 |
.SS qimport |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6912 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6913 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6914 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6915 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6916 |
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
|
6917 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6918 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6919 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6920 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6921 |
The patch is inserted into the series after the last applied |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6922 |
@@ -9859,7 +9831,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6923 |
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
|
6924 |
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
|
6925 |
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
|
6926 |
-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
|
6927 |
+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
|
6928 |
from mq control. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6929 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
6930 |
To import a patch from standard input, pass \- as the patch file. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6931 |
@@ -9869,15 +9841,15 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6932 |
To import an existing patch while renaming it: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6933 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6934 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6935 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6936 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6937 |
hg qimport \-e existing\-patch \-n new\-name |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6938 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6939 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6940 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6941 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6942 |
Returns 0 if import succeeded. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6943 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6944 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6945 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6946 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6947 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6948 |
.B \-e, \-\-existing |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6949 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6950 |
@@ -9902,13 +9874,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6951 |
.B \-P, \-\-push |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6952 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6953 |
qpush after importing |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6954 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6955 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6956 |
.SS qinit |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6957 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6958 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6959 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6960 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6961 |
hg qinit [\-c] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6962 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6963 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6964 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6965 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6966 |
The queue repository is unversioned by default. If |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6967 |
@@ -9917,22 +9889,22 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6968 |
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
|
6969 |
qcommit to commit changes to this queue repository. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6970 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6971 |
-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
|
6972 |
-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
|
6973 |
+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
|
6974 |
+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
|
6975 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6976 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6977 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6978 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6979 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6980 |
.B \-c, \-\-create\-repo |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6981 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6982 |
create queue repository |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6983 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6984 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6985 |
.SS qnew |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6986 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6987 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6988 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6989 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6990 |
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
|
6991 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6992 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6993 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6994 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6995 |
qnew creates a new patch on top of the currently\-applied patch (if |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
6996 |
@@ -9948,7 +9920,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6997 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
6998 |
\-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
|
6999 |
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
|
7000 |
-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
|
7001 |
+empty and the commit message is '[mq]: PATCH'. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7002 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7003 |
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
|
7004 |
format. Read the diffs help topic for more information on why this |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7005 |
@@ -9958,7 +9930,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7006 |
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
|
7007 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7008 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7009 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7010 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7011 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7012 |
.B \-e, \-\-edit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7013 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7014 |
@@ -10003,30 +9975,30 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7015 |
.B \-l, \-\-logfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7016 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7017 |
read commit message from file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7018 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7019 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7020 |
.SS qnext |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7021 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7022 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7023 |
-.ft C |
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 |
hg qnext [\-s] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7026 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7027 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7028 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7029 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7030 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7031 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7032 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7033 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7034 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7035 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7036 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7037 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7038 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7039 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7040 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7041 |
.SS qpop |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7042 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7043 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7044 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7045 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7046 |
hg qpop [\-a] [\-f] [PATCH | INDEX] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7047 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7048 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7049 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7050 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7051 |
Without argument, pops off the top of the patch stack. If given a |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7052 |
@@ -10041,7 +10013,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7053 |
Return 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7054 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7055 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7056 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7057 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7058 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7059 |
.B \-a, \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7060 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7061 |
@@ -10062,30 +10034,30 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7062 |
.B \-\-no\-backup |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7063 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7064 |
do not save backup copies of files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7065 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7066 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7067 |
.SS qprev |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7068 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7069 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7070 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7071 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7072 |
hg qprev [\-s] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7073 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7074 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7075 |
.fi |
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 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7078 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7079 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7080 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7081 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7082 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7083 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7084 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7085 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7086 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7087 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7088 |
.SS qpush |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7089 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7090 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7091 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7092 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7093 |
hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7094 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7095 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7096 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7097 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7098 |
By default, abort if the working directory contains uncommitted |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7099 |
@@ -10096,7 +10068,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7100 |
Return 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7101 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7102 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7103 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7104 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7105 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7106 |
.B \-\-keep\-changes |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7107 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7108 |
@@ -10133,13 +10105,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7109 |
.B \-\-no\-backup |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7110 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7111 |
do not save backup copies of files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7112 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7113 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7114 |
.SS qqueue |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7115 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7116 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7117 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7118 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7119 |
hg qqueue [OPTION] [QUEUE] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7120 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7121 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7122 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7123 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7124 |
Supports switching between different patch queues, as well as creating |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7125 |
@@ -10161,7 +10133,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7126 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7127 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7128 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7129 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7130 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7131 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7132 |
.B \-l, \-\-list |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7133 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7134 |
@@ -10186,13 +10158,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7135 |
.B \-\-purge |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7136 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7137 |
delete queue, and remove patch dir |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7138 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7139 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7140 |
.SS qrefresh |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7141 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7142 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7143 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7144 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7145 |
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
|
7146 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7147 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7148 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7149 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7150 |
If any file patterns are provided, the refreshed patch will |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7151 |
@@ -10214,7 +10186,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7152 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7153 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7154 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7155 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7156 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7157 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7158 |
.B \-e, \-\-edit |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7159 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7160 |
@@ -10259,13 +10231,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7161 |
.B \-l, \-\-logfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7162 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7163 |
read commit message from file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7164 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7165 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7166 |
.SS qrename |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7167 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7168 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7169 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7170 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7171 |
hg qrename PATCH1 [PATCH2] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7172 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7173 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7174 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7175 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7176 |
With one argument, renames the current patch to PATCH1. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7177 |
@@ -10272,24 +10244,24 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7178 |
With two arguments, renames PATCH1 to PATCH2. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7179 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7180 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7181 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7182 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7183 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7184 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7185 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7186 |
aliases: qmv |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7187 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7188 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7189 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7190 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7191 |
.SS qrestore |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7192 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7193 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7194 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7195 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7196 |
hg qrestore [\-d] [\-u] REV |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7197 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7198 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7199 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7200 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7201 |
-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
|
7202 |
+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
|
7203 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7204 |
Options: |
1637
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 \-d, \-\-delete |
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 |
@@ -10298,19 +10270,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7211 |
.B \-u, \-\-update |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7212 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7213 |
update queue working directory |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7214 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7215 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7216 |
.SS qsave |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7217 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7218 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7219 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7220 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7221 |
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
|
7222 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7223 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7224 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7225 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7226 |
-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
|
7227 |
+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
|
7228 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7229 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7230 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7231 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7232 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7233 |
.B \-c, \-\-copy |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7234 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7235 |
@@ -10335,16 +10307,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7236 |
.B \-l, \-\-logfile |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7237 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7238 |
read commit message from file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7239 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7240 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7241 |
.SS qselect |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7242 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7243 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7244 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7245 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7246 |
hg qselect [OPTION]... [GUARD]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7247 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7248 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7249 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7250 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7251 |
-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
|
7252 |
+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
|
7253 |
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
|
7254 |
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
|
7255 |
selected guard, but will not be pushed if any negative guards |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7256 |
@@ -10351,11 +10323,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7257 |
match the current guard. For example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7258 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7259 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7260 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7261 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7262 |
qguard foo.patch \-\- \-stable (negative guard) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7263 |
qguard bar.patch +stable (positive guard) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7264 |
qselect stable |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7265 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7266 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7267 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7268 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7269 |
This activates the "stable" guard. mq will skip foo.patch (because |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7270 |
@@ -10381,7 +10353,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7271 |
Returns 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7272 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7273 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7274 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7275 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7276 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7277 |
.B \-n, \-\-none |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7278 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7279 |
@@ -10398,19 +10370,19 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7280 |
.B \-\-reapply |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7281 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7282 |
pop, then reapply patches |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7283 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7284 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7285 |
.SS qseries |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7286 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7287 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7288 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7289 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7290 |
hg qseries [\-ms] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7291 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7292 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7293 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7294 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7295 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7296 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7297 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7298 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7299 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7300 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7301 |
.B \-m, \-\-missing |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7302 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7303 |
@@ -10419,36 +10391,36 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7304 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7305 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7306 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7307 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7308 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7309 |
.SS qtop |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7310 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7311 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7312 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7313 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7314 |
hg qtop [\-s] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7315 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7316 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7317 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7318 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7319 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7320 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7321 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7322 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7323 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7324 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7325 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7326 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7327 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7328 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7329 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7330 |
.SS qunapplied |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7331 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7332 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7333 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7334 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7335 |
hg qunapplied [\-1] [\-s] [PATCH] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7336 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7337 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7338 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7339 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7340 |
Returns 0 on success. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7341 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7342 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7343 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7344 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7345 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7346 |
.B \-1, \-\-first |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7347 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7348 |
@@ -10457,7 +10429,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7349 |
.B \-s, \-\-summary |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7350 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7351 |
print first line of patch header |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7352 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7353 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7354 |
.SS notify |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7355 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7356 |
hooks for sending email push notifications |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7357 |
@@ -10465,13 +10437,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7358 |
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
|
7359 |
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
|
7360 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7361 |
-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
|
7362 |
+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
|
7363 |
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
|
7364 |
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
|
7365 |
changesets sent to another repository: |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7366 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7367 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7368 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7369 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7370 |
[hooks] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7371 |
# one email for each incoming changeset |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7372 |
incoming.notify = python:hgext.notify.hook |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7373 |
@@ -10480,7 +10452,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7374 |
|
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7375 |
# one email for all outgoing changesets |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7376 |
outgoing.notify = python:hgext.notify.hook |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7377 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7378 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7379 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7380 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7381 |
This registers the hooks. To enable notification, subscribers must |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7382 |
@@ -10489,7 +10461,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7383 |
multiple recipients to a single repository: |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7384 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7385 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7386 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7387 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7388 |
[usersubs] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7389 |
# 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
|
7390 |
user@host = pattern |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7391 |
@@ -10497,7 +10469,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7392 |
[reposubs] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7393 |
# 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
|
7394 |
pattern = user@host |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7395 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7396 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7397 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7398 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7399 |
A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository, |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7400 |
@@ -10505,10 +10477,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7401 |
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
|
7402 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7403 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7404 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7405 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7406 |
[reposubs] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7407 |
*/widgets#branch(release) = qa\[email protected] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7408 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7409 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7410 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7411 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7412 |
This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7413 |
@@ -10519,10 +10491,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7414 |
incorporated by reference: |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7415 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7416 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7417 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7418 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7419 |
[notify] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7420 |
config = /path/to/subscriptionsfile |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7421 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7422 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7423 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7424 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7425 |
Notifications will not be sent until the \fBnotify.test\fP value is set |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7426 |
@@ -10529,7 +10501,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7427 |
to \fBFalse\fP; see below. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7428 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7429 |
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
|
7430 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7431 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7432 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7433 |
.B notify.test |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7434 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7435 |
@@ -10538,8 +10510,8 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7436 |
.B notify.sources |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7437 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7438 |
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
|
7439 |
-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
|
7440 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7441 |
+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
|
7442 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7443 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7444 |
.B \fBserve\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7445 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7446 |
@@ -10560,7 +10532,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7447 |
.B \fBbundle\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7448 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7449 |
changesets sent via \fBhg unbundle\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7450 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7451 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7452 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7453 |
Default: serve. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7454 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7455 |
@@ -10603,7 +10575,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7456 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7457 |
.B notify.maxsubject |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7458 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7459 |
-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
|
7460 |
+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
|
7461 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7462 |
.B notify.diffstat |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7463 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7464 |
@@ -10622,11 +10594,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7465 |
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
|
7466 |
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
|
7467 |
from the pushing repo. Default: False. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7468 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7469 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7470 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7471 |
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
|
7472 |
notifications: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7473 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7474 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7475 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7476 |
.B email.from |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7477 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7478 |
@@ -10637,7 +10609,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7479 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7480 |
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
|
7481 |
references. See also \fBnotify.strip\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7482 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7483 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7484 |
.SS pager |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7485 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7486 |
browse command output with an external pager |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7487 |
@@ -10645,10 +10617,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7488 |
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
|
7489 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7490 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7491 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7492 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7493 |
[pager] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7494 |
pager = less \-FRX |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7495 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7496 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7497 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7498 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7499 |
If no pager is set, the pager extensions uses the environment variable |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7500 |
@@ -10658,10 +10630,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7501 |
pager.ignore list: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7502 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7503 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7504 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7505 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7506 |
[pager] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7507 |
ignore = version, help, update |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7508 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7509 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7510 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7511 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7512 |
You can also enable the pager only for certain commands using |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7513 |
@@ -10668,10 +10640,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7514 |
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
|
7515 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7516 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7517 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7518 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7519 |
[pager] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7520 |
attend = annotate, cat, diff, export, glog, log, qdiff |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7521 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7522 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7523 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7524 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7525 |
Setting pager.attend to an empty value will cause all commands to be |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7526 |
@@ -10679,7 +10651,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7527 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7528 |
If pager.attend is present, pager.ignore will be ignored. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7529 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7530 |
-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
|
7531 |
+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
|
7532 |
to specify them in your user configuration file. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7533 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7534 |
The \-\-pager=... option can also be used to control when the pager is |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7535 |
@@ -10695,7 +10667,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7536 |
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
|
7537 |
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
|
7538 |
message contains two or three body parts: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7539 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7540 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7541 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7542 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7543 |
The changeset description. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7544 |
@@ -10704,8 +10676,8 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7545 |
[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
|
7546 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7547 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7548 |
-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
|
7549 |
-.UNINDENT |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7550 |
+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
|
7551 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7552 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7553 |
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
|
7554 |
and References headers, so they will show up as a sequence in threaded |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7555 |
@@ -10715,7 +10687,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7556 |
configuration file: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7557 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7558 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7559 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7560 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7561 |
[email] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7562 |
from = My Name <my@email> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7563 |
to = recipient1, recipient2, ... |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7564 |
@@ -10722,13 +10694,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7565 |
cc = cc1, cc2, ... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7566 |
bcc = bcc1, bcc2, ... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7567 |
reply\-to = address1, address2, ... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7568 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7569 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7570 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7571 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7572 |
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
|
7573 |
override global \fB[email]\fP address settings. |
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 |
-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
|
7576 |
+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
|
7577 |
changesets as a patchbomb. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7578 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7579 |
You can also either configure the method option in the email section |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7580 |
@@ -10740,13 +10712,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7581 |
.SS email |
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 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7584 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7585 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7586 |
hg email [OPTION]... [DEST]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7587 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7588 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7589 |
.fi |
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 |
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
|
7592 |
-\%\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
|
7593 |
+\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
|
7594 |
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
|
7595 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7596 |
Each patch email has a Subject line of "[PATCH M of N] ...", using |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7597 |
@@ -10757,7 +10729,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7598 |
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
|
7599 |
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
|
7600 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7601 |
-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
|
7602 |
+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
|
7603 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7604 |
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
|
7605 |
with a final summary of all messages and asked for confirmation before |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7606 |
@@ -10797,7 +10769,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7607 |
Examples: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7608 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7609 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7610 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7611 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7612 |
hg email \-r 3000 # send patch 3000 only |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7613 |
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
|
7614 |
hg email \-r 3000:3005 # send patches 3000 through 3005 |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7615 |
@@ -10818,7 +10790,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7616 |
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
|
7617 |
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
|
7618 |
\-bm \-t < mbox # ... using sendmail |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7619 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7620 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7621 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7622 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7623 |
Before using this command, you will need to enable email in your |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7624 |
@@ -10825,7 +10797,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7625 |
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
|
7626 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7627 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7628 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7629 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7630 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7631 |
.B \-g, \-\-git |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7632 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7633 |
@@ -10942,7 +10914,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7634 |
.B \-\-insecure |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7635 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7636 |
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
|
7637 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7638 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7639 |
.SS progress |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7640 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7641 |
show progress bars for some actions |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7642 |
@@ -10955,7 +10927,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7643 |
The following settings are available: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7644 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7645 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7646 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7647 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7648 |
[progress] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7649 |
delay = 3 # number of seconds (float) before showing the progress bar |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7650 |
changedelay = 1 # changedelay: minimum delay before showing a new topic. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7651 |
@@ -10965,11 +10937,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7652 |
format = topic bar number estimate # format of the progress bar |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7653 |
width = <none> # if set, the maximum width of the progress information |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7654 |
# (that is, min(width, term width) will be used) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7655 |
-clear\-complete = True # clear the progress bar after it\(aqs done |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7656 |
-disable = False # if true, don\(aqt show a progress bar |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7657 |
+clear\-complete = True # clear the progress bar after it's done |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7658 |
+disable = False # if true, don't show a progress bar |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7659 |
assume\-tty = False # if true, ALWAYS show a progress bar, unless |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7660 |
# disable is given |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7661 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7662 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7663 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7664 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7665 |
Valid entries for the format field are topic, bar, number, unit, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7666 |
@@ -10984,9 +10956,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7667 |
.SS purge |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7668 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7669 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7670 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7671 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7672 |
hg purge [OPTION]... [DIR]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7673 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7674 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7675 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7676 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7677 |
Delete files not known to Mercurial. This is useful to test local |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7678 |
@@ -10993,18 +10965,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7679 |
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
|
7680 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7681 |
This means that purge will delete: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7682 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7683 |
+.RS 0 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7684 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7685 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7686 |
-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
|
7687 |
+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
|
7688 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7689 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7690 |
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
|
7691 |
they contain files under source control management |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7692 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7693 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7694 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7695 |
But it will leave untouched: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7696 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7697 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7698 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7699 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7700 |
Modified and unmodified tracked files |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7701 |
@@ -11013,8 +10985,8 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7702 |
Ignored files (unless \-\-all is specified) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7703 |
.IP \(bu 2 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7704 |
. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7705 |
-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
|
7706 |
-.UNINDENT |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7707 |
+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
|
7708 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7709 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7710 |
If directories are given on the command line, only files in these |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7711 |
directories are considered. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7712 |
@@ -11025,7 +10997,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7713 |
option. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7714 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7715 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7716 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7717 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7718 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7719 |
.B \-a, \-\-abort\-on\-err |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7720 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7721 |
@@ -11052,7 +11024,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7722 |
exclude names matching the given patterns |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7723 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7724 |
aliases: clean |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7725 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7726 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7727 |
.SS rebase |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7728 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7729 |
command to move sets of revisions to a different ancestor |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7730 |
@@ -11061,14 +11033,14 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7731 |
repository. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7732 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7733 |
For more information: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7734 |
-\%http://mercurial.selenic.com/wiki/RebaseExtension\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7735 |
+http://mercurial.selenic.com/wiki/RebaseExtension |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7736 |
.SS Commands |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7737 |
.SS rebase |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7738 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7739 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7740 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7741 |
+.ft |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7742 |
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
|
7743 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7744 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7745 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7746 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7747 |
Rebase uses repeated merging to graft changesets from one part of |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7748 |
@@ -11082,9 +11054,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7749 |
pulling in your rebased changesets. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7750 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7751 |
In its default configuration, Mercurial will prevent you from |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7752 |
-rebasing published changes. See \%\fBhg help phases\fP\: for details. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7753 |
+rebasing published changes. See \fBhg help phases\fP for details. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7754 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7755 |
-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
|
7756 |
+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
|
7757 |
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
|
7758 |
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
|
7759 |
changesets are added as its descendants.) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7760 |
@@ -11116,7 +11088,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7761 |
and source branch is that, unlike \fBmerge\fP, rebase will do |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7762 |
nothing if you are at the branch tip of a named branch |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7763 |
with two heads. You need to explicitly specify source and/or |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7764 |
-destination (or \fBupdate\fP to the other head, if it\(aqs the head of |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7765 |
+destination (or \fBupdate\fP to the other head, if it's the head of |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7766 |
the intended source branch). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7767 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7768 |
If a rebase is interrupted to manually resolve a merge, it can be |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7769 |
@@ -11126,7 +11098,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7770 |
unresolved conflicts. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7771 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7772 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7773 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7774 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7775 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7776 |
.B \-s, \-\-source |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7777 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7778 |
@@ -11191,7 +11163,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7779 |
.B \-\-template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7780 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7781 |
display with template |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7782 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7783 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7784 |
.SS record |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7785 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7786 |
commands to interactively select changes for commit/qrefresh |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7787 |
@@ -11199,25 +11171,25 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7788 |
.SS qrecord |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7789 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7790 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7791 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7792 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7793 |
hg qrecord [OPTION]... PATCH [FILE]... |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7794 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7795 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7796 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7797 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7798 |
-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
|
7799 |
+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
|
7800 |
usage. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7801 |
.SS record |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7802 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7803 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7804 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7805 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7806 |
hg record [OPTION]... [FILE]... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7807 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7808 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7809 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7810 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7811 |
-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
|
7812 |
+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
|
7813 |
will be candidates for recording. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7814 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7815 |
-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
|
7816 |
+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
|
7817 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7818 |
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
|
7819 |
modified file, and for files with multiple changes, for each |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7820 |
@@ -11225,7 +11197,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7821 |
possible: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7822 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7823 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7824 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7825 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7826 |
y \- record this change |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7827 |
n \- skip this change |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7828 |
e \- edit this change manually |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7829 |
@@ -11238,13 +11210,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7830 |
q \- quit, recording no changes |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7831 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7832 |
? \- display help |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7833 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7834 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7835 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7836 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7837 |
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
|
7838 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7839 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7840 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7841 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7842 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7843 |
.B \-A, \-\-addremove |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7844 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7845 |
@@ -11301,7 +11273,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7846 |
.B \-B, \-\-ignore\-blank\-lines |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7847 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7848 |
ignore changes whose lines are all blank |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7849 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7850 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7851 |
.SS relink |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7852 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7853 |
recreates hardlinks between repository clones |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7854 |
@@ -11309,9 +11281,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7855 |
.SS relink |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7856 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7857 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7858 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7859 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7860 |
hg relink [ORIGIN] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7861 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7862 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7863 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7864 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7865 |
When repositories are cloned locally, their data files will be |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7866 |
@@ -11343,18 +11315,18 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7867 |
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
|
7868 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7869 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7870 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7871 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7872 |
[schemes] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7873 |
py = http://code.python.org/hg/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7874 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7875 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7876 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7877 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7878 |
After that you can use it like: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7879 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7880 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7881 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7882 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7883 |
hg clone py://trunk/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7884 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7885 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7886 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7887 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7888 |
Additionally there is support for some more complex schemas, for |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7889 |
@@ -11361,10 +11333,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7890 |
example used by Google Code: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7891 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7892 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7893 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7894 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7895 |
[schemes] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7896 |
gcode = http://{1}.googlecode.com/hg/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7897 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7898 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7899 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7900 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7901 |
The syntax is taken from Mercurial templates, and you have unlimited |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7902 |
@@ -11376,7 +11348,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7903 |
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
|
7904 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7905 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7906 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7907 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7908 |
[schemes] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7909 |
py = http://hg.python.org/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7910 |
bb = https://bitbucket.org/ |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7911 |
@@ -11383,7 +11355,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7912 |
bb+ssh = ssh://[email protected]/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7913 |
gcode = https://{1}.googlecode.com/hg/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7914 |
kiln = https://{1}.kilnhg.com/Repo/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7915 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7916 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7917 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7918 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7919 |
You can override a predefined scheme by defining a new scheme with the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7920 |
@@ -11395,9 +11367,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7921 |
.SS share |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7922 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7923 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7924 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7925 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7926 |
hg share [\-U] SOURCE [DEST] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7927 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7928 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7929 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7930 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
7931 |
Initialize a new repository and working directory that shares its |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7932 |
@@ -11415,18 +11387,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7933 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7934 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7935 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7936 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7937 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7938 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7939 |
.B \-U, \-\-noupdate |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7940 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7941 |
do not create a working copy |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7942 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7943 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7944 |
.SS unshare |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7945 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7946 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7947 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7948 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7949 |
hg unshare |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7950 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7951 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7952 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7953 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
7954 |
Copy the store data to the repo and remove the sharedpath data. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7955 |
@@ -11440,7 +11412,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7956 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7957 |
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
|
7958 |
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
|
7959 |
-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
|
7960 |
+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
|
7961 |
conflicts if necessary. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7962 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7963 |
You can have more than one shelved change outstanding at a time; each |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7964 |
@@ -11450,9 +11422,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7965 |
.SS shelve |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7966 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7967 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7968 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7969 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7970 |
hg shelve |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7971 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7972 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7973 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7974 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7975 |
Shelving takes files that "hg status" reports as not clean, saves |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7976 |
@@ -11480,7 +11452,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7977 |
all shelved changes, use \fB\-\-cleanup\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7978 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7979 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7980 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7981 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7982 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7983 |
.B \-A, \-\-addremove |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7984 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7985 |
@@ -11517,13 +11489,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7986 |
.B \-\-stat |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7987 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7988 |
output diffstat\-style summary of changes |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7989 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7990 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7991 |
.SS unshelve |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7992 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7993 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7994 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7995 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7996 |
hg unshelve [SHELVED] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7997 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7998 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
7999 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8000 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8001 |
This command accepts an optional name of a shelved change to |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8002 |
@@ -11544,7 +11516,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8003 |
does not delete the bundle.) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8004 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8005 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8006 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8007 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8008 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8009 |
.B \-a, \-\-abort |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8010 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8011 |
@@ -11557,7 +11529,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8012 |
.B \-\-keep |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8013 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8014 |
keep shelve after unshelving |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8015 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8016 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8017 |
.SS strip |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8018 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8019 |
strip changesets and their descendents from history |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8020 |
@@ -11568,9 +11540,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8021 |
.SS strip |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8022 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8023 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8024 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8025 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8026 |
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
|
8027 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8028 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8029 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8030 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8031 |
The strip command removes the specified changesets and all their |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8032 |
@@ -11584,8 +11556,8 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8033 |
completes. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8034 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8035 |
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
|
8036 |
-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
|
8037 |
-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
|
8038 |
+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
|
8039 |
+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
|
8040 |
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
|
8041 |
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
|
8042 |
restore. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8043 |
@@ -11600,7 +11572,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8044 |
Return 0 on success. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8045 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8046 |
Options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8047 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8048 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8049 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8050 |
.B \-r, \-\-rev |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8051 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8052 |
@@ -11633,13 +11605,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8053 |
.B \-B, \-\-bookmark |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8054 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8055 |
remove revs only reachable from given bookmark |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8056 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8057 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8058 |
.SS transplant |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8059 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8060 |
command to transplant changesets from another branch |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8061 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8062 |
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
|
8063 |
-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
|
8064 |
+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
|
8065 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8066 |
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
|
8067 |
map from a changeset hash to its hash in the source repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8068 |
@@ -11647,9 +11619,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8069 |
.SS transplant |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8070 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8071 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8072 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8073 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8074 |
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
|
8075 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8076 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8077 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8078 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8079 |
Selected changesets will be applied on top of the current working |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8080 |
@@ -11666,9 +11638,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8081 |
of the form: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8082 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8083 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8084 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8085 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8086 |
(transplanted from CHANGESETHASH) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8087 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8088 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8089 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8090 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8091 |
You can rewrite the changelog message with the \-\-filter option. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8092 |
@@ -11684,17 +11656,17 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8093 |
with \-\-branch will be transplanted. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8094 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8095 |
Example: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8096 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8097 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8098 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8099 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8100 |
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
|
8101 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8102 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8103 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8104 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8105 |
hg transplant \-\-branch REV \-\-all |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8106 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8107 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8108 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8109 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8110 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8111 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8112 |
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
|
8113 |
changesets. You will not be prompted to transplant any ancestors |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8114 |
@@ -11702,17 +11674,17 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8115 |
normally instead of transplanting them. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8116 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8117 |
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
|
8118 |
-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
|
8119 |
+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
|
8120 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8121 |
-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
|
8122 |
+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
|
8123 |
start an interactive changeset browser. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8124 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8125 |
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
|
8126 |
-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
|
8127 |
-\-\-continue/\-c\fP\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8128 |
+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
|
8129 |
+\-\-continue/\-c\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8130 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8131 |
Options: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8132 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8133 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8134 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8135 |
.B \-s, \-\-source |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8136 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8137 |
@@ -11753,7 +11725,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8138 |
.B \-\-filter |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8139 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8140 |
filter changesets through command |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8141 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8142 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8143 |
.SS win32mbcs |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8144 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8145 |
allow the use of MBCS paths with problematic encodings |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8146 |
@@ -11766,7 +11738,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8147 |
operation. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8148 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8149 |
This extension is useful for: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8150 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8151 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8152 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8153 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8154 |
Japanese Windows users using shift_jis encoding. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8155 |
@@ -11777,10 +11749,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8156 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8157 |
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
|
8158 |
case\-insensitive file system. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8159 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8160 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8161 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8162 |
This extension is not needed for: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8163 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8164 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8165 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8166 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8167 |
Any user who use only ASCII chars in path. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8168 |
@@ -11787,10 +11759,10 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8169 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8170 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8171 |
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
|
8172 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8173 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8174 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8175 |
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
|
8176 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8177 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8178 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8179 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8180 |
You should use single encoding in one repository. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8181 |
@@ -11800,16 +11772,16 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8182 |
.IP \(bu 2 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8183 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8184 |
win32mbcs is not compatible with fixutf8 extension. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8185 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8186 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8187 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8188 |
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
|
8189 |
You can specify the encoding by config option: |
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 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8192 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8193 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8194 |
[win32mbcs] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8195 |
encoding = sjis |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8196 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8197 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8198 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8199 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8200 |
It is useful for the users who want to commit with UTF\-8 log message. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8201 |
@@ -11816,8 +11788,8 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8202 |
.SS win32text |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8203 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8204 |
perform automatic newline conversion |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8205 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8206 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8207 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8208 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8209 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8210 |
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
|
8211 |
the extension again and again for each clone since the configuration |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8212 |
@@ -11826,13 +11798,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8213 |
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
|
8214 |
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
|
8215 |
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
|
8216 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8217 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8218 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8219 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8220 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8221 |
To perform automatic newline conversion, use: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8222 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8223 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8224 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8225 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8226 |
[extensions] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8227 |
win32text = |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8228 |
[encode] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8229 |
@@ -11842,17 +11814,17 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8230 |
[decode] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8231 |
** = cleverdecode: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8232 |
# or ** = macdecode: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8233 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8234 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8235 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8236 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8237 |
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
|
8238 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8239 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8240 |
-.ft C |
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 |
[hooks] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8243 |
pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8244 |
# or pretxncommit.cr = python:hgext.win32text.forbidcr |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8245 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8246 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8247 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8248 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8249 |
To do the same check on a server to prevent CRLF/CR from being |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8250 |
@@ -11859,11 +11831,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8251 |
pushed or pulled: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8252 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8253 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8254 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8255 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8256 |
[hooks] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8257 |
pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8258 |
# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8259 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8260 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8261 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8262 |
.SS zeroconf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8263 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8264 |
@@ -11874,33 +11846,33 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8265 |
without knowing their actual IP address. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8266 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8267 |
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
|
8268 |
-\%\fBhg serve\fP\: in your repository: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8269 |
+\fBhg serve\fP in your repository: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8270 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8271 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8272 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8273 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8274 |
$ cd test |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8275 |
$ hg serve |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8276 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8277 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8278 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8279 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8280 |
You can discover Zeroconf\-enabled repositories by running |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8281 |
-\%\fBhg paths\fP\:: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8282 |
+\fBhg paths\fP: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8283 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8284 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8285 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8286 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8287 |
$ hg paths |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8288 |
zc\-test = http://example.com:8000/test |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8289 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8290 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8291 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8292 |
.SH FILES |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8293 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8294 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8295 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8296 |
.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
|
8297 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8298 |
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
|
8299 |
-\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
|
8300 |
+\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
|
8301 |
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
|
8302 |
-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
|
8303 |
+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
|
8304 |
files. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8305 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8306 |
.B \fB.hgignore\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8307 |
@@ -11907,13 +11879,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8308 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8309 |
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
|
8310 |
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
|
8311 |
-see \%\fBhgignore\fP(5)\:. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8312 |
+see \fBhgignore\fP(5). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8313 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8314 |
.B \fB.hgsub\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8315 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8316 |
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
|
8317 |
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
|
8318 |
-\%\fBhg help subrepos\fP\:. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8319 |
+\fBhg help subrepos\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8320 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8321 |
.B \fB.hgsubstate\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8322 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8323 |
@@ -11928,7 +11900,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8324 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8325 |
.B \fB.hg/last\-message.txt\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8326 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8327 |
-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
|
8328 |
+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
|
8329 |
in case the commit fails. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8330 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8331 |
.B \fB.hg/localtags\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8332 |
@@ -11936,28 +11908,34 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8333 |
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
|
8334 |
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
|
8335 |
encoded using the local system encoding. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8336 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8337 |
+.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8338 |
+.B \fB/usr/demo/mercurial\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8339 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8340 |
+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
|
8341 |
+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
|
8342 |
+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
|
8343 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8344 |
+.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8345 |
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
|
8346 |
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
|
8347 |
it will be overwritten. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8348 |
.SH BUGS |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8349 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8350 |
-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
|
8351 |
+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
|
8352 |
below) when you find them. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8353 |
.SH SEE ALSO |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8354 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8355 |
-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8356 |
+\fBhgignore\fP(5), \fBhgrc\fP(5) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8357 |
.SH AUTHOR |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8358 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8359 |
-Written by Matt Mackall <\%[email protected]\:> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8360 |
+Written by Matt Mackall <[email protected]> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8361 |
.SH RESOURCES |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8362 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8363 |
-Main Web Site: \%http://mercurial.selenic.com/\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8364 |
+Main Web Site: http://mercurial.selenic.com/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8365 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8366 |
-Source code repository: \%http://selenic.com/hg\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8367 |
+Source code repository: http://selenic.com/hg |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8368 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8369 |
-Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8370 |
+Mailing list: http://selenic.com/mailman/listinfo/mercurial |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8371 |
.SH COPYING |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8372 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8373 |
Copyright (C) 2005\-2013 Matt Mackall. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8374 |
--- mercurial-2.8.2/doc/hgignore.5 Wed Jan 1 19:46:48 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8375 |
+++ mercurial-2.8.2/doc/hgignore.5 Tue Jan 7 15:28:43 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8376 |
@@ -3,33 +3,6 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8377 |
.TH HGIGNORE 5 "" "" "Mercurial Manual" |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8378 |
.SH NAME |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8379 |
hgignore \- syntax for Mercurial ignore files |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8380 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8381 |
-.nr rst2man-indent-level 0 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8382 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8383 |
-.de1 rstReportMargin |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8384 |
-\\$1 \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8385 |
-level \\n[rst2man-indent-level] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8386 |
-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
|
8387 |
-- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8388 |
-\\n[rst2man-indent0] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8389 |
-\\n[rst2man-indent1] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8390 |
-\\n[rst2man-indent2] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8391 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8392 |
-.de1 INDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8393 |
-.\" .rstReportMargin pre: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8394 |
-. RS \\$1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8395 |
-. 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
|
8396 |
-. nr rst2man-indent-level +1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8397 |
-.\" .rstReportMargin post: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8398 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8399 |
-.de UNINDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8400 |
-. RE |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8401 |
-.\" indent \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8402 |
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8403 |
-.nr rst2man-indent-level -1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8404 |
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8405 |
-.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
|
8406 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8407 |
.SH SYNOPSIS |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8408 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8409 |
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
|
8410 |
@@ -55,16 +28,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8411 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8412 |
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
|
8413 |
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
|
8414 |
-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
|
8415 |
+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
|
8416 |
configure these files. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8417 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8418 |
-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
|
8419 |
+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
|
8420 |
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
|
8421 |
-\%\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
|
8422 |
+\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
|
8423 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8424 |
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
|
8425 |
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
|
8426 |
-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
|
8427 |
+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
|
8428 |
in .hgignore. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8429 |
.SH SYNTAX |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8430 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8431 |
@@ -79,13 +52,13 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8432 |
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
|
8433 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8434 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8435 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8436 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8437 |
syntax: NAME |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8438 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8439 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8440 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8441 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8442 |
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
|
8443 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8444 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8445 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8446 |
.B \fBregexp\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8447 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8448 |
@@ -94,7 +67,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8449 |
.B \fBglob\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8450 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8451 |
Shell\-style glob. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8452 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8453 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8454 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8455 |
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
|
8456 |
follow, until another syntax is selected. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8457 |
@@ -106,7 +79,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8458 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8459 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8460 |
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
|
8461 |
-Please see \%\fBhg help patterns\fP\: for details. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8462 |
+Please see \fBhg help patterns\fP for details. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8463 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8464 |
.SH EXAMPLE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8465 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8466 |
@@ -113,7 +86,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8467 |
Here is an example ignore file. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8468 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8469 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8470 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8471 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8472 |
# use glob syntax. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8473 |
syntax: glob |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8474 |
|
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8475 |
@@ -124,16 +97,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8476 |
# switch to regexp syntax. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8477 |
syntax: regexp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8478 |
^\e.pc/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8479 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8480 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8481 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8482 |
.SH AUTHOR |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8483 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8484 |
-Vadim Gelfer <\%[email protected]\:> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8485 |
+Vadim Gelfer <[email protected]> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8486 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8487 |
-Mercurial was written by Matt Mackall <\%[email protected]\:>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8488 |
+Mercurial was written by Matt Mackall <[email protected]>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8489 |
.SH SEE ALSO |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8490 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8491 |
-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8492 |
+\fBhg\fP(1), \fBhgrc\fP(5) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8493 |
.SH COPYING |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8494 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8495 |
This manual page is copyright 2006 Vadim Gelfer. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8496 |
--- mercurial-2.8.2/doc/hgrc.5 Wed Jan 1 19:46:48 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8497 |
+++ mercurial-2.8.2/doc/hgrc.5 Tue Jan 7 15:28:46 2014 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8498 |
@@ -3,33 +3,6 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8499 |
.TH HGRC 5 "" "" "Mercurial Manual" |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8500 |
.SH NAME |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8501 |
hgrc \- configuration files for Mercurial |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8502 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8503 |
-.nr rst2man-indent-level 0 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8504 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8505 |
-.de1 rstReportMargin |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8506 |
-\\$1 \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8507 |
-level \\n[rst2man-indent-level] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8508 |
-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
|
8509 |
-- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8510 |
-\\n[rst2man-indent0] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8511 |
-\\n[rst2man-indent1] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8512 |
-\\n[rst2man-indent2] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8513 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8514 |
-.de1 INDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8515 |
-.\" .rstReportMargin pre: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8516 |
-. RS \\$1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8517 |
-. 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
|
8518 |
-. nr rst2man-indent-level +1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8519 |
-.\" .rstReportMargin post: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8520 |
-.. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8521 |
-.de UNINDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8522 |
-. RE |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8523 |
-.\" indent \\n[an-margin] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8524 |
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8525 |
-.nr rst2man-indent-level -1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8526 |
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8527 |
-.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
|
8528 |
-.. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8529 |
.SH DESCRIPTION |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8530 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8531 |
The Mercurial system uses a set of configuration files to control |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8532 |
@@ -40,11 +13,11 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8533 |
by \fBname = value\fP entries: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8534 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8535 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8536 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8537 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8538 |
[ui] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8539 |
username = Firstname Lastname <[email protected]> |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8540 |
verbose = True |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8541 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8542 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8543 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8544 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8545 |
The above entries will be referred to as \fBui.username\fP and |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8546 |
@@ -54,8 +27,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8547 |
Mercurial reads configuration data from several files, if they exist. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8548 |
These files do not exist by default and you will have to create the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8549 |
appropriate configuration files yourself: global configuration like |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8550 |
-the username setting is typically put into |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8551 |
-\fB%USERPROFILE%\emercurial.ini\fP or \fB$HOME/.hgrc\fP and local |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8552 |
+the username setting is typically put into \fB$HOME/.hgrc\fP and local |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8553 |
configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8554 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8555 |
The names of these files depend on the system on which Mercurial is |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8556 |
@@ -65,101 +37,50 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8557 |
ones. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8558 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8559 |
.nf |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8560 |
-(All) \fB<repo>/.hg/hgrc\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8561 |
+\fB<repo>/.hg/hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8562 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8563 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8564 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8565 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8566 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8567 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8568 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8569 |
Per\-repository configuration options that only apply in a |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8570 |
particular repository. This file is not version\-controlled, and |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8571 |
will not get transferred during a "clone" operation. Options in |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8572 |
-this file override options in all other configuration files. On |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8573 |
-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8574 |
+this file override options in all other configuration files. |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8575 |
+Most of this file will be ignored if it doesn't |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8576 |
belong to a trusted user or to a trusted group. See the documentation |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8577 |
for the \fB[trusted]\fP section below for more details. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8578 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8579 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8580 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8581 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8582 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8583 |
.nf |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8584 |
-(Plan 9) \fB$home/lib/hgrc\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8585 |
-(Unix) \fB$HOME/.hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8586 |
-(Windows) \fB%USERPROFILE%\e.hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8587 |
-(Windows) \fB%USERPROFILE%\eMercurial.ini\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8588 |
-(Windows) \fB%HOME%\e.hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8589 |
-(Windows) \fB%HOME%\eMercurial.ini\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8590 |
+\fB$HOME/.hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8591 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8592 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8593 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8594 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8595 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8596 |
+.RS 3 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8597 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8598 |
-Per\-user configuration file(s), for the user running Mercurial. On |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8599 |
-Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8600 |
-files apply to all Mercurial commands executed by this user in any |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8601 |
-directory. Options in these files override per\-system and per\-installation |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8602 |
+Per\-user configuration file, for the user running Mercurial. Options in this |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8603 |
+file apply to all Mercurial commands executed by this user in any |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8604 |
+directory. Options in this file override per\-system and per\-installation |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8605 |
options. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8606 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8607 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8608 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8609 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8610 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8611 |
.nf |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8612 |
-(Plan 9) \fB/lib/mercurial/hgrc\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8613 |
-(Plan 9) \fB/lib/mercurial/hgrc.d/*.rc\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8614 |
-(Unix) \fB/etc/mercurial/hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8615 |
-(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8616 |
+\fB/etc/mercurial/hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8617 |
+\fB/etc/mercurial/hgrc.d/*.rc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8618 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8619 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8620 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8621 |
-.INDENT 3.5 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8622 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8623 |
+.RS 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8624 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8625 |
Per\-system configuration files, for the system on which Mercurial |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8626 |
is running. Options in these files apply to all Mercurial commands |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8627 |
executed by any user in any directory. Options in these files |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8628 |
override per\-installation options. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8629 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8630 |
-.UNINDENT |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8631 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8632 |
-.nf |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8633 |
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8634 |
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8635 |
-(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8636 |
-(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8637 |
-.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8638 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8639 |
-.INDENT 0.0 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8640 |
-.INDENT 3.5 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8641 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8642 |
-Per\-installation configuration files, searched for in the |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8643 |
-directory where Mercurial is installed. \fB<install\-root>\fP is the |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8644 |
-parent directory of the \fBhg\fP executable (or symlink) being run. For |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8645 |
-example, if installed in \fB/shared/tools/bin/hg\fP, Mercurial will look |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8646 |
-in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8647 |
-to all Mercurial commands executed by any user in any directory. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8648 |
-.UNINDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8649 |
-.UNINDENT |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8650 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8651 |
-.nf |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8652 |
-(Windows) \fB<install\-dir>\eMercurial.ini\fP \fBor\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8653 |
-(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP \fBor\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8654 |
-(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8655 |
-.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8656 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8657 |
-.INDENT 0.0 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8658 |
-.INDENT 3.5 |
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 |
-Per\-installation/system configuration files, for the system on |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8661 |
-which Mercurial is running. Options in these files apply to all |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8662 |
-Mercurial commands executed by any user in any directory. Registry |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8663 |
-keys contain PATH\-like strings, every part of which must reference |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8664 |
-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8665 |
-be read. Mercurial checks each of these locations in the specified |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8666 |
-order until one or more configuration files are detected. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8667 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8668 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8669 |
-.IP Note |
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 |
-The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8672 |
-is used when running 32\-bit Python on 64\-bit Windows. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8673 |
.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8674 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8675 |
.SH SYNTAX |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8676 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8677 |
A configuration file consists of sections, led by a \fB[section]\fP header |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8678 |
@@ -167,12 +88,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8679 |
\fBconfiguration keys\fP): |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8680 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8681 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8682 |
-.ft C |
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 |
[spam] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8685 |
eggs=ham |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8686 |
green= |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8687 |
eggs |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8688 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8689 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8690 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8691 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8692 |
Each line contains one entry. If the lines that follow are indented, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8693 |
@@ -184,12 +105,12 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8694 |
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
|
8695 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8696 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8697 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8698 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8699 |
[spam] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8700 |
eggs=large |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8701 |
ham=serrano |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8702 |
eggs=small |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8703 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8704 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8705 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8706 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8707 |
This would set the configuration key named \fBeggs\fP to \fBsmall\fP. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8708 |
@@ -199,7 +120,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8709 |
example: |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8710 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8711 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8712 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8713 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8714 |
[foo] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8715 |
eggs=large |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8716 |
ham=serrano |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8717 |
@@ -214,7 +135,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8718 |
ham=prosciutto |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8719 |
eggs=medium |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8720 |
bread=toasted |
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 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8725 |
This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8726 |
@@ -236,9 +157,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8727 |
\fBfile\fP. This lets you do something like: |
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 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8730 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8731 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8732 |
%include ~/.hgrc.d/$HOST.rc |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8733 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8734 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8735 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8736 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8737 |
to include a different configuration file on each computer you use. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8738 |
@@ -255,9 +176,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8739 |
placed in double quotation marks: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8740 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8741 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8742 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8743 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8744 |
allow_read = "John Doe, PhD", brian, betty |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8745 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8746 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8747 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8748 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8749 |
Quotation marks can be escaped by prefixing them with a backslash. Only |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8750 |
@@ -281,17 +202,17 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8751 |
Alias definitions consist of lines of the form: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8752 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8753 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8754 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8755 |
+.ft |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8756 |
<alias> = <command> [<argument>]... |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8757 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8758 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8759 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8760 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8761 |
For example, this definition: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8762 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8763 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8764 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8765 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8766 |
latest = log \-\-limit 5 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8767 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8768 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8769 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8770 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8771 |
creates a new command \fBlatest\fP that shows only the five most recent |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8772 |
@@ -298,9 +219,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8773 |
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
|
8774 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8775 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8776 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8777 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8778 |
stable5 = latest \-b stable |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8779 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8780 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8781 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8782 |
.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8783 |
. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8784 |
@@ -314,9 +235,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8785 |
run arbitrary commands. As an example, |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8786 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8787 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8788 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8789 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8790 |
echo = !echo $@ |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8791 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8792 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8793 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8794 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8795 |
will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8796 |
@@ -323,9 +244,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8797 |
terminal. A better example might be: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8798 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8799 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8800 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8801 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8802 |
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
|
8803 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8804 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8805 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8806 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
8807 |
which will make \fBhg purge\fP delete all unknown files in the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8808 |
@@ -354,7 +275,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8809 |
Settings used when displaying file annotations. All values are |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8810 |
Booleans and default to False. See \fBdiff\fP section for related |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8811 |
options for the diff command. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8812 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8813 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8814 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8815 |
.B \fBignorews\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8816 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8817 |
@@ -367,7 +288,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8818 |
.B \fBignoreblanklines\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8819 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8820 |
Ignore changes whose lines are all blank. |
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 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8823 |
.SS \fBauth\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8824 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8825 |
Authentication credentials for HTTP authentication. This section |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8826 |
@@ -378,9 +299,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8827 |
Each line has the following format: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8828 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8829 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8830 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8831 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8832 |
<name>.<argument> = <value> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8833 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8834 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8835 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8836 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8837 |
where \fB<name>\fP is used to group arguments into authentication |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8838 |
@@ -387,7 +308,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8839 |
entries. Example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8840 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8841 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8842 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8843 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8844 |
foo.prefix = hg.intevation.org/mercurial |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8845 |
foo.username = foo |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8846 |
foo.password = bar |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8847 |
@@ -397,11 +318,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8848 |
bar.key = path/to/file.key |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8849 |
bar.cert = path/to/file.cert |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8850 |
bar.schemes = https |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8851 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8852 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8853 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8854 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8855 |
Supported arguments: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8856 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8857 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8858 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8859 |
.B \fBprefix\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8860 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8861 |
@@ -408,7 +329,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8862 |
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
|
8863 |
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
|
8864 |
(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
|
8865 |
-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
|
8866 |
+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
|
8867 |
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
|
8868 |
argument, q.v., is then subsequently consulted. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8869 |
.TP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8870 |
@@ -440,11 +361,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8871 |
.B \fBschemes\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8872 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8873 |
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
|
8874 |
-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
|
8875 |
+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
|
8876 |
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
|
8877 |
static\-http and static\-https respectively, as well. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8878 |
Default: https. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8879 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8880 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8881 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8882 |
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
|
8883 |
for credentials as usual if required by the remote. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8884 |
@@ -470,7 +391,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8885 |
Pipe example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8886 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8887 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8888 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8889 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8890 |
[encode] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8891 |
# 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
|
8892 |
# note: not necessarily a good idea, just an example |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8893 |
@@ -478,9 +399,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8894 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8895 |
[decode] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8896 |
# 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
|
8897 |
-# 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
|
8898 |
+# 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
|
8899 |
*.gz = gzip |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8900 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8901 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8902 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8903 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8904 |
A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8905 |
@@ -488,12 +409,6 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8906 |
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
|
8907 |
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
|
8908 |
the command. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8909 |
-.IP Note |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8910 |
-. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8911 |
-The tempfile mechanism is recommended for Windows systems, |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8912 |
-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
|
8913 |
-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
|
8914 |
-.RE |
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 |
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
|
8917 |
translate line ending characters between Windows (CRLF) and Unix (LF) |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8918 |
@@ -500,20 +415,20 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8919 |
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
|
8920 |
.SS \fBdefaults\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8921 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8922 |
-(defaults are deprecated. Don\(aqt use them. Use aliases instead) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8923 |
+(defaults are deprecated. Don't use them. Use aliases instead) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8924 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8925 |
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
|
8926 |
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
|
8927 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8928 |
-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
|
8929 |
-\%\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
|
8930 |
+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
|
8931 |
+\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
|
8932 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8933 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8934 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8935 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8936 |
[defaults] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8937 |
log = \-v |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8938 |
status = \-m |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8939 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8940 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8941 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8942 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8943 |
The actual commands, instead of their aliases, must be used when |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8944 |
@@ -524,7 +439,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8945 |
Settings used when displaying diffs. Everything except for \fBunified\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8946 |
is a Boolean and defaults to False. See \fBannotate\fP section for |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8947 |
related options for the annotate command. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8948 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8949 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8950 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8951 |
.B \fBgit\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8952 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8953 |
@@ -532,7 +447,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8954 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8955 |
.B \fBnodates\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8956 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8957 |
-Don\(aqt include dates in diff headers. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8958 |
+Don't include dates in diff headers. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8959 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8960 |
.B \fBshowfunc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8961 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8962 |
@@ -553,11 +468,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8963 |
.B \fBunified\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8964 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8965 |
Number of lines of context to show. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8966 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8967 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8968 |
.SS \fBemail\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8969 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8970 |
Settings for extensions that send email messages. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8971 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8972 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8973 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8974 |
.B \fBfrom\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8975 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8976 |
@@ -566,16 +481,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8977 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8978 |
.B \fBto\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8979 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8980 |
-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
|
8981 |
+Optional. Comma\-separated list of recipients' email addresses. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8982 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8983 |
.B \fBcc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8984 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8985 |
-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
|
8986 |
+Optional. Comma\-separated list of carbon copy recipients' |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8987 |
email addresses. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8988 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8989 |
.B \fBbcc\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8990 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8991 |
-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
|
8992 |
+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
|
8993 |
email addresses. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8994 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
8995 |
.B \fBmethod\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8996 |
@@ -598,7 +513,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8997 |
empty (explicit) list. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8998 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
8999 |
Order of outgoing email character sets: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9000 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9001 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9002 |
.IP 1. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9003 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9004 |
\fBus\-ascii\fP: always first, regardless of settings |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9005 |
@@ -614,13 +529,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9006 |
.IP 5. 3 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9007 |
. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9008 |
\fButf\-8\fP: always last, regardless of settings |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9009 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9010 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9011 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9012 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9013 |
.sp |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9014 |
Email example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9015 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9016 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9017 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9018 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9019 |
[email] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9020 |
from = Joseph User <[email protected]> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9021 |
method = /usr/sbin/sendmail |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9022 |
@@ -627,7 +542,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9023 |
# charsets for western Europeans |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9024 |
# 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
|
9025 |
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
|
9026 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9027 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9028 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9029 |
.SS \fBextensions\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9030 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9031 |
@@ -634,7 +549,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9032 |
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
|
9033 |
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
|
9034 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9035 |
-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
|
9036 |
+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
|
9037 |
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
|
9038 |
after the \fB=\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9039 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9040 |
@@ -649,16 +564,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9041 |
Example for \fB~/.hgrc\fP: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9042 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9043 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9044 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9045 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9046 |
[extensions] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9047 |
-# (the progress extension will get loaded from Mercurial\(aqs path) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9048 |
+# (the progress extension will get loaded from Mercurial's path) |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9049 |
progress = |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9050 |
# (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
|
9051 |
myfeature = ~/.hgext/myfeature.py |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9052 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9053 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9054 |
.fi |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9055 |
.SS \fBformat\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9056 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9057 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9058 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9059 |
.B \fBusestore\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9060 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9061 |
@@ -686,7 +601,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9062 |
Mac OS X and spaces on Windows. Enabled by default. Disabling this |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9063 |
option ensures that the on\-disk format of newly created |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9064 |
repositories will be compatible with Mercurial before version 1.7. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9065 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9066 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9067 |
.SS \fBgraph\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9068 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9069 |
Web graph view configuration. This section let you change graph |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9070 |
@@ -696,9 +611,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9071 |
Each line has the following format: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9072 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9073 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9074 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9075 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9076 |
<branch>.<argument> = <value> |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9077 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9078 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9079 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9080 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9081 |
where \fB<branch>\fP is the name of the branch being |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9082 |
@@ -705,17 +620,17 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9083 |
customized. Example: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9084 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9085 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9086 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9087 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9088 |
[graph] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9089 |
# 2px width |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9090 |
default.width = 2 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9091 |
# red color |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9092 |
default.color = FF0000 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9093 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9094 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9095 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9096 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9097 |
Supported arguments: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9098 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9099 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9100 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9101 |
.B \fBwidth\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9102 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9103 |
@@ -724,7 +639,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9104 |
.B \fBcolor\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9105 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9106 |
Set branch edges color in hexadecimal RGB notation. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9107 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9108 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9109 |
.SS \fBhooks\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9110 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9111 |
Commands or Python functions that get automatically executed by |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9112 |
@@ -739,7 +654,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9113 |
Example \fB.hg/hgrc\fP: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9114 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9115 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9116 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9117 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9118 |
[hooks] |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9119 |
# update working directory after adding changesets |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9120 |
changegroup.update = hg update |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9121 |
@@ -749,13 +664,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9122 |
incoming.autobuild = /my/build/hook |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9123 |
# 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
|
9124 |
priority.incoming.autobuild = 1 |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9125 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9126 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9127 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9128 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9129 |
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
|
9130 |
additional information. For each hook below, the environment |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9131 |
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
|
9132 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9133 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9134 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9135 |
.B \fBchangegroup\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9136 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9137 |
@@ -799,7 +714,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9138 |
representations of the data internally passed to <command>. \fB$HG_OPTS\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9139 |
is a dictionary of options (with unspecified options set to their |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9140 |
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
|
9141 |
-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
|
9142 |
+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
|
9143 |
code. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9144 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9145 |
.B \fBprechangegroup\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9146 |
@@ -899,7 +814,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9147 |
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
|
9148 |
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
|
9149 |
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
|
9150 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9151 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9152 |
.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9153 |
. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9154 |
It is generally better to use standard hooks rather than the |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9155 |
@@ -908,21 +823,14 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9156 |
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
|
9157 |
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
|
9158 |
.RE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9159 |
-.IP Note |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9160 |
-. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9161 |
-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
|
9162 |
-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
|
9163 |
-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
|
9164 |
-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
|
9165 |
-.RE |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9166 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9167 |
The syntax for Python hooks is as follows: |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9168 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9169 |
.nf |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9170 |
-.ft C |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9171 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9172 |
hookname = python:modulename.submodule.callable |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9173 |
hookname = python:/path/to/python/module.py:callable |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9174 |
-.ft P |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9175 |
+.ft |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9176 |
.fi |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9177 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9178 |
Python hooks are run within the Mercurial process. Each hook is |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9179 |
@@ -946,10 +854,10 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9180 |
For example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9181 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9182 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9183 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9184 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9185 |
[hostfingerprints] |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9186 |
hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9187 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9188 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9189 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9190 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9191 |
This feature is only supported when using Python 2.6 or later. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9192 |
@@ -957,7 +865,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9193 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9194 |
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
|
9195 |
proxy. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9196 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9197 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9198 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9199 |
.B \fBhost\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9200 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9201 |
@@ -981,7 +889,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9202 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9203 |
Optional. Always use the proxy, even for localhost and any entries |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9204 |
in \fBhttp_proxy.no\fP. True or False. Default: False. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9205 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9206 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9207 |
.SS \fBmerge\-patterns\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9208 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9209 |
This section specifies merge tools to associate with particular file |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9210 |
@@ -992,11 +900,11 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9211 |
Example: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9212 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9213 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9214 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9215 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9216 |
[merge\-patterns] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9217 |
**.c = kdiff3 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9218 |
**.jpg = myimgmerge |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9219 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9220 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9221 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9222 |
.SS \fBmerge\-tools\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9223 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9224 |
@@ -1006,7 +914,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9225 |
Example \fB~/.hgrc\fP: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9226 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9227 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9228 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9229 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9230 |
[merge\-tools] |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9231 |
# Override stock tool location |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9232 |
kdiff3.executable = ~/bin/kdiff3 |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9233 |
@@ -1017,13 +925,12 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9234 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9235 |
# Define new tool |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9236 |
myHtmlTool.args = \-m $local $other $base $output |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9237 |
-myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9238 |
myHtmlTool.priority = 1 |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9239 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9240 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9241 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9242 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9243 |
Supported arguments: |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9244 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9245 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9246 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9247 |
.B \fBpriority\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9248 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9249 |
@@ -1032,9 +939,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9250 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9251 |
.B \fBexecutable\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9252 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9253 |
-Either just the name of the executable or its pathname. On Windows, |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9254 |
-the path can use environment variables with ${ProgramFiles} syntax. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9255 |
-Default: the tool name. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9256 |
+Either just the name of the executable or its pathname. Default: the tool name. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9257 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9258 |
.B \fBargs\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9259 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9260 |
@@ -1063,7 +968,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9261 |
.B \fBcheck\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9262 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9263 |
A list of merge success\-checking options: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9264 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9265 |
+.RS 7 |
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 \fBchanged\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9268 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9269 |
@@ -1076,7 +981,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9270 |
.B \fBprompt\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9271 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9272 |
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
|
9273 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9274 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9275 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9276 |
.B \fBfixeol\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9277 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9278 |
@@ -1086,42 +991,16 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9279 |
.B \fBgui\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9280 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9281 |
This tool requires a graphical interface to run. Default: False |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9282 |
-.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9283 |
-.B \fBregkey\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9284 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9285 |
-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
|
9286 |
-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
|
9287 |
-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9288 |
-Default: None |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9289 |
-.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9290 |
-.B \fBregkeyalt\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9291 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9292 |
-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
|
9293 |
-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
|
9294 |
-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
|
9295 |
-is to search for 32bit applications on 64bit operating systems. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9296 |
-Default: None |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9297 |
-.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9298 |
-.B \fBregname\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9299 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9300 |
-Name of value to read from specified registry key. Defaults to the |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9301 |
-unnamed (default) value. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9302 |
-.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9303 |
-.B \fBregappend\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9304 |
-.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9305 |
-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
|
9306 |
-the executable name of the tool. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9307 |
-Default: None |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9308 |
-.UNINDENT |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9309 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9310 |
.SS \fBpatch\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9311 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9312 |
-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
|
9313 |
+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
|
9314 |
command or with Mercurial Queues extension. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9315 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9316 |
+.RS 0 |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9317 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9318 |
.B \fBeol\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9319 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9320 |
-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
|
9321 |
+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
|
9322 |
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
|
9323 |
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
|
9324 |
normalized to either LF (Unix) or CRLF (Windows). When set to |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9325 |
@@ -1130,7 +1009,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9326 |
on a per\-file basis. If target file does not exist or has no end |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9327 |
of line, patch line endings are preserved. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9328 |
Default: strict. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9329 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9330 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9331 |
.SS \fBpaths\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9332 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9333 |
Assigns symbolic names to repositories. The left side is the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9334 |
@@ -1137,7 +1016,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9335 |
symbolic name, and the right gives the directory or URL that is the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9336 |
location of the repository. Default paths can be declared by setting |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9337 |
the following entries. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9338 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9339 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9340 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9341 |
.B \fBdefault\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9342 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9343 |
@@ -1149,30 +1028,30 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9344 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9345 |
Optional. Directory or URL to use when pushing if no destination |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9346 |
is specified. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9347 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9348 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9349 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9350 |
Custom paths can be defined by assigning the path to a name that later can be |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9351 |
used from the command line. Example: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9352 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9353 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9354 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9355 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9356 |
[paths] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9357 |
my_path = http://example.com/path |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9358 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9359 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9360 |
.fi |
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 |
To push to the path defined in \fBmy_path\fP run the command: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9363 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9364 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9365 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9366 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9367 |
hg push my_path |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9368 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9369 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9370 |
.fi |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9371 |
.SS \fBphases\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9372 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9373 |
-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
|
9374 |
+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
|
9375 |
information about working with phases. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9376 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9377 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9378 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9379 |
.B \fBpublish\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9380 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9381 |
@@ -1185,7 +1064,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9382 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9383 |
Phase of newly\-created commits. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9384 |
Default: draft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9385 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9386 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9387 |
.SS \fBprofiling\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9388 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9389 |
Specifies profiling type, format, and file output. Two profilers are |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9390 |
@@ -1192,21 +1071,21 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9391 |
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
|
9392 |
profiler (named \fBstat\fP). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9393 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9394 |
-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
|
9395 |
-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
|
9396 |
+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
|
9397 |
+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
|
9398 |
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
|
9399 |
profiling is done using lsprof. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9400 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9401 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9402 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9403 |
.B \fBtype\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9404 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9405 |
The type of profiler to use. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9406 |
Default: ls. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9407 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9408 |
+.RS 7 |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9409 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9410 |
.B \fBls\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9411 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9412 |
-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
|
9413 |
+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
|
9414 |
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
|
9415 |
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
|
9416 |
identify the expensive parts of a non\-trivial function. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9417 |
@@ -1216,13 +1095,13 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9418 |
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
|
9419 |
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
|
9420 |
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
|
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 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9424 |
.B \fBformat\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9425 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9426 |
Profiling format. Specific to the \fBls\fP instrumenting profiler. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9427 |
Default: text. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9428 |
-.INDENT 7.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9429 |
+.RS 7 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9430 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9431 |
.B \fBtext\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9432 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9433 |
@@ -1235,7 +1114,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9434 |
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
|
9435 |
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
|
9436 |
kcachegrind. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9437 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9438 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9439 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9440 |
.B \fBfrequency\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9441 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9442 |
@@ -1266,14 +1145,14 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9443 |
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
|
9444 |
Specific to the \fBls\fP instrumenting profiler. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9445 |
Default: 5. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9446 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9447 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9448 |
.SS \fBrevsetalias\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9449 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9450 |
-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
|
9451 |
+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
|
9452 |
.SS \fBserver\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9453 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9454 |
Controls generic server settings. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9455 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9456 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9457 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9458 |
.B \fBuncompressed\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9459 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9460 |
@@ -1298,11 +1177,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9461 |
Whether to validate the completeness of pushed changesets by |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9462 |
checking that all new file revisions specified in manifests are |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9463 |
present. Default is False. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9464 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9465 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9466 |
.SS \fBsmtp\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9467 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9468 |
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
|
9469 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9470 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9471 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9472 |
.B \fBhost\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9473 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9474 |
@@ -1327,7 +1206,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9475 |
\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
|
9476 |
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
|
9477 |
\fB[hostfingerprints]\fP and \fB[web] cacerts\fP. \-\-insecure for |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9478 |
-\%\fBhg email\fP\: overwrites this as "loose". Default: "strict". |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9479 |
+\fBhg email\fP overwrites this as "loose". Default: "strict". |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9480 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9481 |
.B \fBusername\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9482 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9483 |
@@ -1342,9 +1221,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9484 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9485 |
.B \fBlocal_hostname\fP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9486 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9487 |
-Optional. It\(aqs the hostname that the sender can use to identify |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9488 |
+Optional. It's the hostname that the sender can use to identify |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9489 |
itself to the MTA. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9490 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9491 |
+.RE |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9492 |
.SS \fBsubpaths\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9493 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9494 |
Subrepository source URLs can go stale if a remote server changes name |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9495 |
@@ -1352,9 +1231,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9496 |
rewrite rules of the form: |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9497 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9498 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9499 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9500 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9501 |
<pattern> = <replacement> |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9502 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9503 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9504 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9505 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9506 |
where \fBpattern\fP is a regular expression matching a subrepository |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9507 |
@@ -1363,9 +1242,9 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9508 |
\fBreplacements\fP. For instance: |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9509 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9510 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9511 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9512 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9513 |
http://server/(.*)\-hg/ = http://hg.server/\e1/ |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9514 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9515 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9516 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9517 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9518 |
rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9519 |
@@ -1376,7 +1255,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9520 |
.SS \fBtrusted\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9521 |
.sp |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9522 |
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
|
9523 |
-\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
|
9524 |
+\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
|
9525 |
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
|
9526 |
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
|
9527 |
hooks or extensions for shared repositories or servers. However, |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9528 |
@@ -1388,7 +1267,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9529 |
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
|
9530 |
\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
|
9531 |
user or service running Mercurial. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9532 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9533 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9534 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9535 |
.B \fBusers\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9536 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9537 |
@@ -1397,17 +1276,17 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9538 |
.B \fBgroups\fP |
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 |
Comma\-separated list of trusted groups. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9541 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9542 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9543 |
.SS \fBui\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9544 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9545 |
User interface controls. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9546 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9547 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9548 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9549 |
.B \fBarchivemeta\fP |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9550 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9551 |
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
|
9552 |
(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
|
9553 |
-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
|
9554 |
+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
|
9555 |
Default is True. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9556 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9557 |
.B \fBaskusername\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9558 |
@@ -1435,7 +1314,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9559 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9560 |
.B \fBfallbackencoding\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9561 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9562 |
-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
|
9563 |
+Encoding to try if it's not possible to decode the changelog using |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9564 |
UTF\-8. Default is ISO\-8859\-1. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9565 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9566 |
.B \fBignore\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9567 |
@@ -1458,7 +1337,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9568 |
.B \fBmerge\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9569 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9570 |
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
|
9571 |
-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
|
9572 |
+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
|
9573 |
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
|
9574 |
.TP |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9575 |
.B \fBportablefilenames\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9576 |
@@ -1467,7 +1346,7 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9577 |
Default is \fBwarn\fP. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9578 |
If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9579 |
platforms, if a file with a non\-portable filename is added (e.g. a file |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9580 |
-with a name that can\(aqt be created on Windows because it contains reserved |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9581 |
+with a name that can't be created on Windows because it contains reserved |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9582 |
parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9583 |
collision with an existing file). |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9584 |
If set to \fBignore\fP (or \fBfalse\fP), no warning is printed. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9585 |
@@ -1528,7 +1407,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9586 |
.B \fBusername\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9587 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9588 |
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
|
9589 |
-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
|
9590 |
+Typically a person's name and email address, e.g. \fBFred Widget |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9591 |
<[email protected]>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9592 |
the username in hgrc is empty, it has to be specified manually or |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9593 |
in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9594 |
@@ -1538,11 +1417,11 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9595 |
.B \fBverbose\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9596 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9597 |
Increase the amount of output printed. True or False. Default is False. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9598 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9599 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9600 |
.SS \fBweb\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9601 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9602 |
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
|
9603 |
-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
|
9604 |
+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
|
9605 |
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
|
9606 |
and WSGI). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9607 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9608 |
@@ -1558,9 +1437,9 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9609 |
command line: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9610 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9611 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9612 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9613 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9614 |
$ 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
|
9615 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9616 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9617 |
.fi |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9618 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9619 |
Note that this will allow anybody to push anything to the server and |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9620 |
@@ -1567,7 +1446,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9621 |
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
|
9622 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9623 |
The full set of options is: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9624 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9625 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9626 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9627 |
.B \fBaccesslog\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9628 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9629 |
@@ -1651,13 +1530,13 @@ |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9630 |
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
|
9631 |
command line. |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9632 |
.sp |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9633 |
-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
|
9634 |
+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
|
9635 |
one. On most Linux systems this will be |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9636 |
\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
|
9637 |
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
|
9638 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9639 |
.nf |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9640 |
-.ft C |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9641 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9642 |
\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9643 |
\&... (certificate in base64 PEM encoding) ... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9644 |
\-\-\-\-\-END CERTIFICATE\-\-\-\-\- |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9645 |
@@ -1664,7 +1543,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9646 |
\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9647 |
\&... (certificate in base64 PEM encoding) ... |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9648 |
\-\-\-\-\-END CERTIFICATE\-\-\-\-\- |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9649 |
-.ft P |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9650 |
+.ft |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9651 |
.fi |
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9652 |
.TP |
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
9653 |
.B \fBcache\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9654 |
@@ -1725,7 +1604,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9655 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9656 |
.B \fBdescription\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9657 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9658 |
-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
|
9659 |
+Textual description of the repository's purpose or contents. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9660 |
Default is "unknown". |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9661 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9662 |
.B \fBencoding\fP |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9663 |
@@ -1790,7 +1669,7 @@ |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9664 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9665 |
.B \fBprefix\fP |
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 |
-Prefix path to serve from. Default is \(aq\(aq (server root). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9668 |
+Prefix path to serve from. Default is '' (server root). |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9669 |
.TP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9670 |
.B \fBpush_ssl\fP |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9671 |
.sp |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9672 |
@@ -1816,7 +1695,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9673 |
.B \fBtemplates\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9674 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9675 |
Where to find the HTML templates. Default is install path. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9676 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9677 |
+.RE |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9678 |
.SS \fBwebsub\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9679 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9680 |
Web substitution filter definition. You can use this section to |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9681 |
@@ -1838,9 +1717,9 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9682 |
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
|
9683 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9684 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9685 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9686 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9687 |
patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9688 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9689 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9690 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9691 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9692 |
You can use any separator other than "/". The final "i" is optional |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9693 |
@@ -1849,12 +1728,12 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9694 |
Examples: |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9695 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9696 |
.nf |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9697 |
-.ft C |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9698 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9699 |
[websub] |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9700 |
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
|
9701 |
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
|
9702 |
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
|
9703 |
-.ft P |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9704 |
+.ft |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9705 |
.fi |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9706 |
.SS \fBworker\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9707 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9708 |
@@ -1861,7 +1740,7 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9709 |
Parallel master/worker configuration. We currently perform working |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9710 |
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
|
9711 |
helps performance. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9712 |
-.INDENT 0.0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9713 |
+.RS 0 |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9714 |
.TP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9715 |
.B \fBnumcpus\fP |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9716 |
.sp |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9717 |
@@ -1868,18 +1747,18 @@ |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9718 |
Number of CPUs to use for parallel operations. Default is 4 or the |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9719 |
number of CPUs on the system, whichever is larger. A zero or |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9720 |
negative value is treated as \fBuse the default\fP. |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9721 |
-.UNINDENT |
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9722 |
+.RE |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9723 |
.SH AUTHOR |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9724 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9725 |
-Bryan O\(aqSullivan <\%[email protected]\:>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9726 |
+Bryan O'Sullivan <[email protected]>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9727 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9728 |
-Mercurial was written by Matt Mackall <\%[email protected]\:>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9729 |
+Mercurial was written by Matt Mackall <[email protected]>. |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9730 |
.SH SEE ALSO |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9731 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9732 |
-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\: |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9733 |
+\fBhg\fP(1), \fBhgignore\fP(5) |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9734 |
.SH COPYING |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9735 |
.sp |
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9736 |
-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
|
9737 |
+This manual page is copyright 2005 Bryan O'Sullivan. |
1637
54bd5ac8db85
18050227 mercurial 2.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
821
diff
changeset
|
9738 |
Mercurial is copyright 2005\-2013 Matt Mackall. |
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
181
diff
changeset
|
9739 |
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
|
9740 |
Public License version 2 or any later version. |