Mercurial > hg
annotate tests/test-qrecord.out @ 11904:122e3e0ba3e4
tests: unify test-keyword
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 13 Aug 2010 13:54:33 +0100 |
parents | 226a328a7ff3 |
children |
rev | line source |
---|---|
5933 | 1 % help (no mq, so no qrecord) |
2 hg: unknown command 'qrecord' | |
3 Mercurial Distributed SCM | |
4 | |
5 basic commands: | |
6 | |
7 add add the specified files on the next commit | |
8779
708938509732
Improve English for help text of many core hg commands.
timeless <timeless@gmail.com>
parents:
8348
diff
changeset
|
8 annotate show changeset information by line for each file |
5933 | 9 clone make a copy of an existing repository |
10 commit commit the specified files or all outstanding changes | |
11 diff diff repository (or selected files) | |
12 export dump the header and diffs for one or more changesets | |
8902
b9a8b616521d
Add a forget command for easily untracking files.
Steve Losh <steve@stevelosh.com>
parents:
8779
diff
changeset
|
13 forget forget the specified files on the next commit |
5933 | 14 init create a new repository in the given directory |
15 log show revision history of entire repository or files | |
16 merge merge working directory with another revision | |
17 pull pull changes from the specified source | |
18 push push changes to the specified destination | |
19 remove remove the specified files on the next commit | |
10889
e25c450c351e
commands: improve some command summaries
Matt Mackall <mpm@selenic.com>
parents:
10694
diff
changeset
|
20 serve start stand-alone webserver |
5933 | 21 status show changed files in the working directory |
9603 | 22 summary summarize working directory state |
10889
e25c450c351e
commands: improve some command summaries
Matt Mackall <mpm@selenic.com>
parents:
10694
diff
changeset
|
23 update update working directory (or switch revisions) |
5933 | 24 |
25 use "hg help" for the full list of commands or "hg -v" for details | |
26 % help (mq present) | |
27 hg qrecord [OPTION]... PATCH [FILE]... | |
28 | |
29 interactively record a new patch | |
30 | |
10973
49a07f441496
Use hg role in help strings
Martin Geisler <mg@aragost.com>
parents:
10889
diff
changeset
|
31 See "hg help qnew" & "hg help record" for more information and usage. |
5933 | 32 |
33 options: | |
34 | |
11321
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
35 -e --edit edit commit message |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
36 -g --git use git extended diff format |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
37 -U --currentuser add "From: <current user>" to patch |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
38 -u --user USER add "From: <USER>" to patch |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
39 -D --currentdate add "Date: <current date>" to patch |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
40 -d --date DATE add "Date: <DATE>" to patch |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
41 -I --include PATTERN [+] include names matching the given patterns |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
42 -X --exclude PATTERN [+] exclude names matching the given patterns |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
43 -m --message TEXT use text as commit message |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
44 -l --logfile FILE read commit message from file |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
45 |
40c06bbf58be
help: show value requirement and multiple occurrence of options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
11047
diff
changeset
|
46 [+] marked option can be specified multiple times |
5933 | 47 |
48 use "hg -v help qrecord" to show global options | |
49 % base commit | |
50 % changing files | |
51 % whole diff | |
52 diff -r 1057167b20ef 1.txt | |
53 --- a/1.txt | |
54 +++ b/1.txt | |
55 @@ -1,5 +1,5 @@ | |
56 1 | |
57 -2 | |
58 +2 2 | |
59 3 | |
60 -4 | |
61 +4 4 | |
62 5 | |
63 diff -r 1057167b20ef 2.txt | |
64 --- a/2.txt | |
65 +++ b/2.txt | |
66 @@ -1,5 +1,5 @@ | |
67 a | |
68 -b | |
69 +b b | |
70 c | |
71 d | |
72 e | |
73 diff -r 1057167b20ef dir/a.txt | |
74 --- a/dir/a.txt | |
75 +++ b/dir/a.txt | |
76 @@ -1,4 +1,4 @@ | |
77 -hello world | |
78 +hello world! | |
79 | |
80 someone | |
81 up | |
82 % qrecord a.patch | |
83 diff --git a/1.txt b/1.txt | |
11728
226a328a7ff3
record: count lines changed as the number of lines added or removed
timeless <timeless@gmail.com>
parents:
11321
diff
changeset
|
84 2 hunks, 2 lines changed |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
85 examine changes to '1.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
86 @@ -1,3 +1,3 @@ |
5933 | 87 1 |
88 -2 | |
89 +2 2 | |
90 3 | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
91 record change 1/6 to '1.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
92 @@ -3,3 +3,3 @@ |
5933 | 93 3 |
94 -4 | |
95 +4 4 | |
96 5 | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
97 record change 2/6 to '1.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
98 diff --git a/2.txt b/2.txt |
11728
226a328a7ff3
record: count lines changed as the number of lines added or removed
timeless <timeless@gmail.com>
parents:
11321
diff
changeset
|
99 1 hunks, 1 lines changed |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
100 examine changes to '2.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
101 @@ -1,5 +1,5 @@ |
5933 | 102 a |
103 -b | |
104 +b b | |
105 c | |
106 d | |
107 e | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
108 record change 4/6 to '2.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
109 diff --git a/dir/a.txt b/dir/a.txt |
11728
226a328a7ff3
record: count lines changed as the number of lines added or removed
timeless <timeless@gmail.com>
parents:
11321
diff
changeset
|
110 1 hunks, 1 lines changed |
9461 | 111 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
112 |
5933 | 113 % after qrecord a.patch 'tip' |
114 changeset: 1:5d1ca63427ee | |
11047
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
10973
diff
changeset
|
115 tag: a.patch |
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
10973
diff
changeset
|
116 tag: qbase |
5933 | 117 tag: qtip |
118 tag: tip | |
119 user: test | |
120 date: Thu Jan 01 00:00:00 1970 +0000 | |
121 summary: aaa | |
122 | |
123 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt | |
124 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
125 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
126 @@ -1,5 +1,5 @@ | |
127 1 | |
128 -2 | |
129 +2 2 | |
130 3 | |
131 4 | |
132 5 | |
133 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt | |
134 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
135 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
136 @@ -1,5 +1,5 @@ | |
137 a | |
138 -b | |
139 +b b | |
140 c | |
141 d | |
142 e | |
143 | |
144 | |
145 % after qrecord a.patch 'diff' | |
146 diff -r 5d1ca63427ee 1.txt | |
147 --- a/1.txt | |
148 +++ b/1.txt | |
149 @@ -1,5 +1,5 @@ | |
150 1 | |
151 2 2 | |
152 3 | |
153 -4 | |
154 +4 4 | |
155 5 | |
156 diff -r 5d1ca63427ee dir/a.txt | |
157 --- a/dir/a.txt | |
158 +++ b/dir/a.txt | |
159 @@ -1,4 +1,4 @@ | |
160 -hello world | |
161 +hello world! | |
162 | |
163 someone | |
164 up | |
165 % qrecord b.patch | |
166 diff --git a/1.txt b/1.txt | |
11728
226a328a7ff3
record: count lines changed as the number of lines added or removed
timeless <timeless@gmail.com>
parents:
11321
diff
changeset
|
167 1 hunks, 1 lines changed |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
168 examine changes to '1.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
169 @@ -1,5 +1,5 @@ |
5933 | 170 1 |
171 2 2 | |
172 3 | |
173 -4 | |
174 +4 4 | |
175 5 | |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
176 record change 1/3 to '1.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
177 diff --git a/dir/a.txt b/dir/a.txt |
11728
226a328a7ff3
record: count lines changed as the number of lines added or removed
timeless <timeless@gmail.com>
parents:
11321
diff
changeset
|
178 1 hunks, 1 lines changed |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
179 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
180 @@ -1,4 +1,4 @@ |
5933 | 181 -hello world |
182 +hello world! | |
183 | |
184 someone | |
185 up | |
9461 | 186 record change 3/3 to 'dir/a.txt'? [Ynsfdaq?] |
10694
d7732d2df54a
record: separate each hunk with a blank line
Martin Geisler <mg@lazybytes.net>
parents:
9606
diff
changeset
|
187 |
5933 | 188 % after qrecord b.patch 'tip' |
189 changeset: 2:b056198bf878 | |
11047
c7dbd6c4877a
tags: return tags in sorted order
Eric Eisner <ede@mit.edu>
parents:
10973
diff
changeset
|
190 tag: b.patch |
5933 | 191 tag: qtip |
192 tag: tip | |
193 user: test | |
194 date: Thu Jan 01 00:00:00 1970 +0000 | |
195 summary: bbb | |
196 | |
197 diff -r 5d1ca63427ee -r b056198bf878 1.txt | |
198 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
199 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
200 @@ -1,5 +1,5 @@ | |
201 1 | |
202 2 2 | |
203 3 | |
204 -4 | |
205 +4 4 | |
206 5 | |
207 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt | |
208 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
209 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
210 @@ -1,4 +1,4 @@ | |
211 -hello world | |
212 +hello world! | |
213 | |
214 someone | |
215 up | |
216 | |
217 | |
218 % after qrecord b.patch 'diff' | |
219 | |
220 % --- end --- |