Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-record.out @ 5037:b2607267236d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add record extension, giving darcs-like interactive hunk picking
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Jul 2007 16:28:05 -0700
parents
children 4f34d9b2568e
comparison
equal deleted inserted replaced
5036:ca0d02222d6a 5037:b2607267236d
1 % help
2 hg record [FILE]...
3
4 interactively select changes to commit
5
6 options:
7
8 -A --addremove mark new/missing files as added/removed before committing
9 -d --date record datecode as commit date
10 -u --user record user as commiter
11 -I --include include names matching the given patterns
12 -X --exclude exclude names matching the given patterns
13 -m --message use <text> as commit message
14 -l --logfile read commit message from <file>
15
16 use "hg -v help record" to show global options
17 % select no files
18 diff --git a/empty-rw b/empty-rw
19 new file mode 100644
20 record changes to 'empty-rw'? [y]es [n]o no changes to record
21
22 changeset: -1:000000000000
23 tag: tip
24 user:
25 date: Thu Jan 01 00:00:00 1970 +0000
26
27
28 % select files but no hunks
29 diff --git a/empty-rw b/empty-rw
30 new file mode 100644
31 record changes to 'empty-rw'? [y]es [n]o transaction abort!
32 rollback completed
33
34 changeset: -1:000000000000
35 tag: tip
36 user:
37 date: Thu Jan 01 00:00:00 1970 +0000
38
39
40 % record empty file
41 diff --git a/empty-rw b/empty-rw
42 new file mode 100644
43 record changes to 'empty-rw'? [y]es [n]o
44 changeset: 0:c0708cf4e46e
45 tag: tip
46 user: test
47 date: Thu Jan 01 00:00:00 1970 +0000
48 summary: empty
49
50
51 % rename empty file
52 diff --git a/empty-rw b/empty-rename
53 rename from empty-rw
54 rename to empty-rename
55 record changes to 'empty-rw' and 'empty-rename'? [y]es [n]o
56 changeset: 1:df251d174da3
57 tag: tip
58 user: test
59 date: Thu Jan 01 00:00:01 1970 +0000
60 summary: rename
61
62
63 % copy empty file
64 diff --git a/empty-rename b/empty-copy
65 copy from empty-rename
66 copy to empty-copy
67 record changes to 'empty-rename' and 'empty-copy'? [y]es [n]o
68 changeset: 2:b63ea3939f8d
69 tag: tip
70 user: test
71 date: Thu Jan 01 00:00:02 1970 +0000
72 summary: copy
73
74
75 % delete empty file
76 diff --git a/empty-copy b/empty-copy
77 deleted file mode 100644
78 record changes to 'empty-copy'? [y]es [n]o
79 changeset: 3:a2546574bce9
80 tag: tip
81 user: test
82 date: Thu Jan 01 00:00:03 1970 +0000
83 summary: delete
84
85
86 % add binary file
87 diff --git a/tip.bundle b/tip.bundle
88 new file mode 100644
89 this is a binary file
90 record changes to 'tip.bundle'? [y]es [n]o
91 changeset: 4:9e998a545a8b
92 tag: tip
93 user: test
94 date: Thu Jan 01 00:00:04 1970 +0000
95 summary: binary
96
97 diff -r a2546574bce9 -r 9e998a545a8b tip.bundle
98 Binary file tip.bundle has changed
99
100 % change binary file
101 diff --git a/tip.bundle b/tip.bundle
102 this modifies a binary file (all or nothing)
103 record changes to 'tip.bundle'? [y]es [n]o
104 changeset: 5:93d05561507d
105 tag: tip
106 user: test
107 date: Thu Jan 01 00:00:05 1970 +0000
108 summary: binary-change
109
110 diff -r 9e998a545a8b -r 93d05561507d tip.bundle
111 Binary file tip.bundle has changed
112
113 % rename and change binary file
114 diff --git a/tip.bundle b/top.bundle
115 rename from tip.bundle
116 rename to top.bundle
117 this modifies a binary file (all or nothing)
118 record changes to 'tip.bundle' and 'top.bundle'? [y]es [n]o
119 changeset: 6:699cc1bea9aa
120 tag: tip
121 user: test
122 date: Thu Jan 01 00:00:06 1970 +0000
123 summary: binary-change-rename
124
125 diff -r 93d05561507d -r 699cc1bea9aa tip.bundle
126 Binary file tip.bundle has changed
127 diff -r 93d05561507d -r 699cc1bea9aa top.bundle
128 Binary file top.bundle has changed
129
130 % add plain file
131 diff --git a/plain b/plain
132 new file mode 100644
133 record changes to 'plain'? [y]es [n]o
134 changeset: 7:118ed744216b
135 tag: tip
136 user: test
137 date: Thu Jan 01 00:00:07 1970 +0000
138 summary: plain
139
140 diff -r 699cc1bea9aa -r 118ed744216b plain
141 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
142 +++ b/plain Thu Jan 01 00:00:07 1970 +0000
143 @@ -0,0 +1,10 @@
144 +1
145 +2
146 +3
147 +4
148 +5
149 +6
150 +7
151 +8
152 +9
153 +10
154
155 % modify end of plain file
156 diff --git a/plain b/plain
157 1 hunks, 1 lines changed
158 record changes to 'plain'? [y]es [n]o @@ -8,3 +8,4 @@ 8
159 8
160 9
161 10
162 +11
163 record this change to 'plain'? [y]es [n]o % modify end of plain file, no EOL
164 diff --git a/plain b/plain
165 1 hunks, 1 lines changed
166 record changes to 'plain'? [y]es [n]o @@ -9,3 +9,4 @@ 9
167 9
168 10
169 11
170 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
171 \ No newline at end of file
172 record this change to 'plain'? [y]es [n]o % modify end of plain file, add EOL
173 diff --git a/plain b/plain
174 1 hunks, 2 lines changed
175 record changes to 'plain'? [y]es [n]o @@ -9,4 +9,4 @@ 9
176 9
177 10
178 11
179 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
180 \ No newline at end of file
181 +cf81a2760718a74d44c0c2eecb72f659e63a69c5
182 record this change to 'plain'? [y]es [n]o % modify beginning, trim end, record both
183 diff --git a/plain b/plain
184 2 hunks, 4 lines changed
185 record changes to 'plain'? [y]es [n]o @@ -1,4 +1,4 @@ 1
186 -1
187 +2
188 2
189 3
190 4
191 record this change to 'plain'? [y]es [n]o @@ -8,5 +8,3 @@ 8
192 8
193 9
194 10
195 -11
196 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
197 record this change to 'plain'? [y]es [n]o
198 changeset: 11:d09ab1967dab
199 tag: tip
200 user: test
201 date: Thu Jan 01 00:00:10 1970 +0000
202 summary: begin-and-end
203
204 diff -r e2ecd9b0b78d -r d09ab1967dab plain
205 --- a/plain Thu Jan 01 00:00:10 1970 +0000
206 +++ b/plain Thu Jan 01 00:00:10 1970 +0000
207 @@ -1,4 +1,4 @@ 1
208 -1
209 +2
210 2
211 3
212 4
213 @@ -8,5 +8,3 @@ 8
214 8
215 9
216 10
217 -11
218 -cf81a2760718a74d44c0c2eecb72f659e63a69c5
219
220 % trim beginning, modify end
221 % record end
222 diff --git a/plain b/plain
223 2 hunks, 5 lines changed
224 record changes to 'plain'? [y]es [n]o @@ -1,9 +1,6 @@ 2
225 -2
226 -2
227 -3
228 4
229 5
230 6
231 7
232 8
233 9
234 record this change to 'plain'? [y]es [n]o @@ -4,7 +1,7 @@
235 4
236 5
237 6
238 7
239 8
240 9
241 -10
242 +10.new
243 record this change to 'plain'? [y]es [n]o
244 changeset: 12:44516c9708ae
245 tag: tip
246 user: test
247 date: Thu Jan 01 00:00:11 1970 +0000
248 summary: end-only
249
250 diff -r d09ab1967dab -r 44516c9708ae plain
251 --- a/plain Thu Jan 01 00:00:10 1970 +0000
252 +++ b/plain Thu Jan 01 00:00:11 1970 +0000
253 @@ -7,4 +7,4 @@ 7
254 7
255 8
256 9
257 -10
258 +10.new
259
260 % record beginning
261 diff --git a/plain b/plain
262 1 hunks, 3 lines changed
263 record changes to 'plain'? [y]es [n]o @@ -1,6 +1,3 @@ 2
264 -2
265 -2
266 -3
267 4
268 5
269 6
270 record this change to 'plain'? [y]es [n]o
271 changeset: 13:3ebbace64a8d
272 tag: tip
273 user: test
274 date: Thu Jan 01 00:00:12 1970 +0000
275 summary: begin-only
276
277 diff -r 44516c9708ae -r 3ebbace64a8d plain
278 --- a/plain Thu Jan 01 00:00:11 1970 +0000
279 +++ b/plain Thu Jan 01 00:00:12 1970 +0000
280 @@ -1,6 +1,3 @@ 2
281 -2
282 -2
283 -3
284 4
285 5
286 6
287
288 % add to beginning, trim from end
289 % record end
290 diff --git a/plain b/plain
291 2 hunks, 4 lines changed
292 record changes to 'plain'? [y]es [n]o @@ -1,6 +1,9 @@ 4
293 +1
294 +2
295 +3
296 4
297 5
298 6
299 7
300 8
301 9
302 record this change to 'plain'? [y]es [n]o @@ -1,7 +4,6 @@
303 4
304 5
305 6
306 7
307 8
308 9
309 -10.new
310 record this change to 'plain'? [y]es [n]o % add to beginning, middle, end
311 % record beginning, middle
312 diff --git a/plain b/plain
313 3 hunks, 7 lines changed
314 record changes to 'plain'? [y]es [n]o @@ -1,2 +1,5 @@ 4
315 +1
316 +2
317 +3
318 4
319 5
320 record this change to 'plain'? [y]es [n]o @@ -1,6 +4,8 @@
321 4
322 5
323 +5.new
324 +5.reallynew
325 6
326 7
327 8
328 9
329 record this change to 'plain'? [y]es [n]o @@ -3,4 +8,6 @@
330 6
331 7
332 8
333 9
334 +10
335 +11
336 record this change to 'plain'? [y]es [n]o
337 changeset: 15:c1c639d8b268
338 tag: tip
339 user: test
340 date: Thu Jan 01 00:00:14 1970 +0000
341 summary: middle-only
342
343 diff -r efc0dad7bd9f -r c1c639d8b268 plain
344 --- a/plain Thu Jan 01 00:00:13 1970 +0000
345 +++ b/plain Thu Jan 01 00:00:14 1970 +0000
346 @@ -1,5 +1,10 @@ 4
347 +1
348 +2
349 +3
350 4
351 5
352 +5.new
353 +5.reallynew
354 6
355 7
356 8
357
358 % record end
359 diff --git a/plain b/plain
360 1 hunks, 2 lines changed
361 record changes to 'plain'? [y]es [n]o @@ -9,3 +9,5 @@ 7
362 7
363 8
364 9
365 +10
366 +11
367 record this change to 'plain'? [y]es [n]o
368 changeset: 16:80b74bbc7808
369 tag: tip
370 user: test
371 date: Thu Jan 01 00:00:15 1970 +0000
372 summary: end-only
373
374 diff -r c1c639d8b268 -r 80b74bbc7808 plain
375 --- a/plain Thu Jan 01 00:00:14 1970 +0000
376 +++ b/plain Thu Jan 01 00:00:15 1970 +0000
377 @@ -9,3 +9,5 @@ 7
378 7
379 8
380 9
381 +10
382 +11
383