1 % help |
|
2 hg record [OPTION]... [FILE]... |
|
3 |
|
4 interactively select changes to commit |
|
5 |
|
6 If a list of files is omitted, all changes reported by "hg status" will be |
|
7 candidates for recording. |
|
8 |
|
9 See "hg help dates" for a list of formats valid for -d/--date. |
|
10 |
|
11 You will be prompted for whether to record changes to each modified file, |
|
12 and for files with multiple changes, for each change to use. For each |
|
13 query, the following responses are possible: |
|
14 |
|
15 y - record this change |
|
16 n - skip this change |
|
17 |
|
18 s - skip remaining changes to this file |
|
19 f - record remaining changes to this file |
|
20 |
|
21 d - done, skip remaining changes and files |
|
22 a - record all changes to all remaining files |
|
23 q - quit, recording no changes |
|
24 |
|
25 ? - display help |
|
26 |
|
27 This command is not available when committing a merge. |
|
28 |
|
29 options: |
|
30 |
|
31 -A --addremove mark new/missing files as added/removed before |
|
32 committing |
|
33 --close-branch mark a branch as closed, hiding it from the branch |
|
34 list |
|
35 -I --include PATTERN [+] include names matching the given patterns |
|
36 -X --exclude PATTERN [+] exclude names matching the given patterns |
|
37 -m --message TEXT use text as commit message |
|
38 -l --logfile FILE read commit message from file |
|
39 -d --date DATE record datecode as commit date |
|
40 -u --user USER record the specified user as committer |
|
41 |
|
42 [+] marked option can be specified multiple times |
|
43 |
|
44 use "hg -v help record" to show global options |
|
45 % select no files |
|
46 diff --git a/empty-rw b/empty-rw |
|
47 new file mode 100644 |
|
48 examine changes to 'empty-rw'? [Ynsfdaq?] |
|
49 no changes to record |
|
50 |
|
51 changeset: -1:000000000000 |
|
52 tag: tip |
|
53 user: |
|
54 date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 |
|
56 |
|
57 % select files but no hunks |
|
58 diff --git a/empty-rw b/empty-rw |
|
59 new file mode 100644 |
|
60 examine changes to 'empty-rw'? [Ynsfdaq?] |
|
61 abort: empty commit message |
|
62 |
|
63 changeset: -1:000000000000 |
|
64 tag: tip |
|
65 user: |
|
66 date: Thu Jan 01 00:00:00 1970 +0000 |
|
67 |
|
68 |
|
69 % record empty file |
|
70 diff --git a/empty-rw b/empty-rw |
|
71 new file mode 100644 |
|
72 examine changes to 'empty-rw'? [Ynsfdaq?] |
|
73 |
|
74 changeset: 0:c0708cf4e46e |
|
75 tag: tip |
|
76 user: test |
|
77 date: Thu Jan 01 00:00:00 1970 +0000 |
|
78 summary: empty |
|
79 |
|
80 |
|
81 % summary shows we updated to the new cset |
|
82 parent: 0:c0708cf4e46e tip |
|
83 empty |
|
84 branch: default |
|
85 commit: (clean) |
|
86 update: (current) |
|
87 |
|
88 % rename empty file |
|
89 diff --git a/empty-rw b/empty-rename |
|
90 rename from empty-rw |
|
91 rename to empty-rename |
|
92 examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] |
|
93 |
|
94 changeset: 1:d695e8dcb197 |
|
95 tag: tip |
|
96 user: test |
|
97 date: Thu Jan 01 00:00:01 1970 +0000 |
|
98 summary: rename |
|
99 |
|
100 |
|
101 % copy empty file |
|
102 diff --git a/empty-rename b/empty-copy |
|
103 copy from empty-rename |
|
104 copy to empty-copy |
|
105 examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] |
|
106 |
|
107 changeset: 2:1d4b90bea524 |
|
108 tag: tip |
|
109 user: test |
|
110 date: Thu Jan 01 00:00:02 1970 +0000 |
|
111 summary: copy |
|
112 |
|
113 |
|
114 % delete empty file |
|
115 diff --git a/empty-copy b/empty-copy |
|
116 deleted file mode 100644 |
|
117 examine changes to 'empty-copy'? [Ynsfdaq?] |
|
118 |
|
119 changeset: 3:b39a238f01a1 |
|
120 tag: tip |
|
121 user: test |
|
122 date: Thu Jan 01 00:00:03 1970 +0000 |
|
123 summary: delete |
|
124 |
|
125 |
|
126 % add binary file |
|
127 1 changesets found |
|
128 diff --git a/tip.bundle b/tip.bundle |
|
129 new file mode 100644 |
|
130 this is a binary file |
|
131 examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
132 |
|
133 changeset: 4:ad816da3711e |
|
134 tag: tip |
|
135 user: test |
|
136 date: Thu Jan 01 00:00:04 1970 +0000 |
|
137 summary: binary |
|
138 |
|
139 diff -r b39a238f01a1 -r ad816da3711e tip.bundle |
|
140 Binary file tip.bundle has changed |
|
141 |
|
142 % change binary file |
|
143 1 changesets found |
|
144 diff --git a/tip.bundle b/tip.bundle |
|
145 this modifies a binary file (all or nothing) |
|
146 examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
147 |
|
148 changeset: 5:dccd6f3eb485 |
|
149 tag: tip |
|
150 user: test |
|
151 date: Thu Jan 01 00:00:05 1970 +0000 |
|
152 summary: binary-change |
|
153 |
|
154 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle |
|
155 Binary file tip.bundle has changed |
|
156 |
|
157 % rename and change binary file |
|
158 1 changesets found |
|
159 diff --git a/tip.bundle b/top.bundle |
|
160 rename from tip.bundle |
|
161 rename to top.bundle |
|
162 this modifies a binary file (all or nothing) |
|
163 examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] |
|
164 |
|
165 changeset: 6:7fa44105f5b3 |
|
166 tag: tip |
|
167 user: test |
|
168 date: Thu Jan 01 00:00:06 1970 +0000 |
|
169 summary: binary-change-rename |
|
170 |
|
171 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle |
|
172 Binary file tip.bundle has changed |
|
173 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle |
|
174 Binary file top.bundle has changed |
|
175 |
|
176 % add plain file |
|
177 diff --git a/plain b/plain |
|
178 new file mode 100644 |
|
179 examine changes to 'plain'? [Ynsfdaq?] |
|
180 |
|
181 changeset: 7:11fb457c1be4 |
|
182 tag: tip |
|
183 user: test |
|
184 date: Thu Jan 01 00:00:07 1970 +0000 |
|
185 summary: plain |
|
186 |
|
187 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain |
|
188 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
189 +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
190 @@ -0,0 +1,10 @@ |
|
191 +1 |
|
192 +2 |
|
193 +3 |
|
194 +4 |
|
195 +5 |
|
196 +6 |
|
197 +7 |
|
198 +8 |
|
199 +9 |
|
200 +10 |
|
201 |
|
202 % modify end of plain file |
|
203 diff --git a/plain b/plain |
|
204 1 hunks, 1 lines changed |
|
205 examine changes to 'plain'? [Ynsfdaq?] |
|
206 @@ -8,3 +8,4 @@ |
|
207 8 |
|
208 9 |
|
209 10 |
|
210 +11 |
|
211 record this change to 'plain'? [Ynsfdaq?] |
|
212 % modify end of plain file, no EOL |
|
213 diff --git a/plain b/plain |
|
214 1 hunks, 1 lines changed |
|
215 examine changes to 'plain'? [Ynsfdaq?] |
|
216 @@ -9,3 +9,4 @@ |
|
217 9 |
|
218 10 |
|
219 11 |
|
220 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
221 \ No newline at end of file |
|
222 record this change to 'plain'? [Ynsfdaq?] |
|
223 % modify end of plain file, add EOL |
|
224 diff --git a/plain b/plain |
|
225 1 hunks, 1 lines changed |
|
226 examine changes to 'plain'? [Ynsfdaq?] |
|
227 @@ -9,4 +9,4 @@ |
|
228 9 |
|
229 10 |
|
230 11 |
|
231 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
232 \ No newline at end of file |
|
233 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
234 record this change to 'plain'? [Ynsfdaq?] |
|
235 % modify beginning, trim end, record both |
|
236 diff --git a/plain b/plain |
|
237 2 hunks, 3 lines changed |
|
238 examine changes to 'plain'? [Ynsfdaq?] |
|
239 @@ -1,4 +1,4 @@ |
|
240 -1 |
|
241 +2 |
|
242 2 |
|
243 3 |
|
244 4 |
|
245 record change 1/2 to 'plain'? [Ynsfdaq?] |
|
246 @@ -8,5 +8,3 @@ |
|
247 8 |
|
248 9 |
|
249 10 |
|
250 -11 |
|
251 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
252 record change 2/2 to 'plain'? [Ynsfdaq?] |
|
253 |
|
254 changeset: 11:efca65c9b09e |
|
255 tag: tip |
|
256 user: test |
|
257 date: Thu Jan 01 00:00:10 1970 +0000 |
|
258 summary: begin-and-end |
|
259 |
|
260 diff -r cd07d48e8cbe -r efca65c9b09e plain |
|
261 --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
262 +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
263 @@ -1,4 +1,4 @@ |
|
264 -1 |
|
265 +2 |
|
266 2 |
|
267 3 |
|
268 4 |
|
269 @@ -8,5 +8,3 @@ |
|
270 8 |
|
271 9 |
|
272 10 |
|
273 -11 |
|
274 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
|
275 |
|
276 % trim beginning, modify end |
|
277 % record end |
|
278 diff --git a/plain b/plain |
|
279 2 hunks, 4 lines changed |
|
280 examine changes to 'plain'? [Ynsfdaq?] |
|
281 @@ -1,9 +1,6 @@ |
|
282 -2 |
|
283 -2 |
|
284 -3 |
|
285 4 |
|
286 5 |
|
287 6 |
|
288 7 |
|
289 8 |
|
290 9 |
|
291 record change 1/2 to 'plain'? [Ynsfdaq?] |
|
292 @@ -4,7 +1,7 @@ |
|
293 4 |
|
294 5 |
|
295 6 |
|
296 7 |
|
297 8 |
|
298 9 |
|
299 -10 |
|
300 +10.new |
|
301 record change 2/2 to 'plain'? [Ynsfdaq?] |
|
302 |
|
303 changeset: 12:7d1e66983c15 |
|
304 tag: tip |
|
305 user: test |
|
306 date: Thu Jan 01 00:00:11 1970 +0000 |
|
307 summary: end-only |
|
308 |
|
309 diff -r efca65c9b09e -r 7d1e66983c15 plain |
|
310 --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
311 +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
312 @@ -7,4 +7,4 @@ |
|
313 7 |
|
314 8 |
|
315 9 |
|
316 -10 |
|
317 +10.new |
|
318 |
|
319 % record beginning |
|
320 diff --git a/plain b/plain |
|
321 1 hunks, 3 lines changed |
|
322 examine changes to 'plain'? [Ynsfdaq?] |
|
323 @@ -1,6 +1,3 @@ |
|
324 -2 |
|
325 -2 |
|
326 -3 |
|
327 4 |
|
328 5 |
|
329 6 |
|
330 record this change to 'plain'? [Ynsfdaq?] |
|
331 |
|
332 changeset: 13:a09fc62a0e61 |
|
333 tag: tip |
|
334 user: test |
|
335 date: Thu Jan 01 00:00:12 1970 +0000 |
|
336 summary: begin-only |
|
337 |
|
338 diff -r 7d1e66983c15 -r a09fc62a0e61 plain |
|
339 --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
340 +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
341 @@ -1,6 +1,3 @@ |
|
342 -2 |
|
343 -2 |
|
344 -3 |
|
345 4 |
|
346 5 |
|
347 6 |
|
348 |
|
349 % add to beginning, trim from end |
|
350 % record end |
|
351 diff --git a/plain b/plain |
|
352 2 hunks, 4 lines changed |
|
353 examine changes to 'plain'? [Ynsfdaq?] |
|
354 @@ -1,6 +1,9 @@ |
|
355 +1 |
|
356 +2 |
|
357 +3 |
|
358 4 |
|
359 5 |
|
360 6 |
|
361 7 |
|
362 8 |
|
363 9 |
|
364 record change 1/2 to 'plain'? [Ynsfdaq?] |
|
365 @@ -1,7 +4,6 @@ |
|
366 4 |
|
367 5 |
|
368 6 |
|
369 7 |
|
370 8 |
|
371 9 |
|
372 -10.new |
|
373 record change 2/2 to 'plain'? [Ynsfdaq?] |
|
374 % add to beginning, middle, end |
|
375 % record beginning, middle |
|
376 diff --git a/plain b/plain |
|
377 3 hunks, 7 lines changed |
|
378 examine changes to 'plain'? [Ynsfdaq?] |
|
379 @@ -1,2 +1,5 @@ |
|
380 +1 |
|
381 +2 |
|
382 +3 |
|
383 4 |
|
384 5 |
|
385 record change 1/3 to 'plain'? [Ynsfdaq?] |
|
386 @@ -1,6 +4,8 @@ |
|
387 4 |
|
388 5 |
|
389 +5.new |
|
390 +5.reallynew |
|
391 6 |
|
392 7 |
|
393 8 |
|
394 9 |
|
395 record change 2/3 to 'plain'? [Ynsfdaq?] |
|
396 @@ -3,4 +8,6 @@ |
|
397 6 |
|
398 7 |
|
399 8 |
|
400 9 |
|
401 +10 |
|
402 +11 |
|
403 record change 3/3 to 'plain'? [Ynsfdaq?] |
|
404 |
|
405 changeset: 15:7d137997f3a6 |
|
406 tag: tip |
|
407 user: test |
|
408 date: Thu Jan 01 00:00:14 1970 +0000 |
|
409 summary: middle-only |
|
410 |
|
411 diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain |
|
412 --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
413 +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
414 @@ -1,5 +1,10 @@ |
|
415 +1 |
|
416 +2 |
|
417 +3 |
|
418 4 |
|
419 5 |
|
420 +5.new |
|
421 +5.reallynew |
|
422 6 |
|
423 7 |
|
424 8 |
|
425 |
|
426 % record end |
|
427 diff --git a/plain b/plain |
|
428 1 hunks, 2 lines changed |
|
429 examine changes to 'plain'? [Ynsfdaq?] |
|
430 @@ -9,3 +9,5 @@ |
|
431 7 |
|
432 8 |
|
433 9 |
|
434 +10 |
|
435 +11 |
|
436 record this change to 'plain'? [Ynsfdaq?] |
|
437 |
|
438 changeset: 16:4959e3ff13eb |
|
439 tag: tip |
|
440 user: test |
|
441 date: Thu Jan 01 00:00:15 1970 +0000 |
|
442 summary: end-only |
|
443 |
|
444 diff -r 7d137997f3a6 -r 4959e3ff13eb plain |
|
445 --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
446 +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
447 @@ -9,3 +9,5 @@ |
|
448 7 |
|
449 8 |
|
450 9 |
|
451 +10 |
|
452 +11 |
|
453 |
|
454 adding subdir/a |
|
455 diff --git a/subdir/a b/subdir/a |
|
456 1 hunks, 1 lines changed |
|
457 examine changes to 'subdir/a'? [Ynsfdaq?] |
|
458 @@ -1,1 +1,2 @@ |
|
459 a |
|
460 +a |
|
461 record this change to 'subdir/a'? [Ynsfdaq?] |
|
462 |
|
463 changeset: 18:40698cd490b2 |
|
464 tag: tip |
|
465 user: test |
|
466 date: Thu Jan 01 00:00:16 1970 +0000 |
|
467 summary: subdir-change |
|
468 |
|
469 diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a |
|
470 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
471 +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
472 @@ -1,1 +1,2 @@ |
|
473 a |
|
474 +a |
|
475 |
|
476 % help, quit |
|
477 diff --git a/subdir/f1 b/subdir/f1 |
|
478 1 hunks, 1 lines changed |
|
479 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
480 y - record this change |
|
481 n - skip this change |
|
482 s - skip remaining changes to this file |
|
483 f - record remaining changes to this file |
|
484 d - done, skip remaining changes and files |
|
485 a - record all changes to all remaining files |
|
486 q - quit, recording no changes |
|
487 ? - display help |
|
488 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
489 abort: user quit |
|
490 % skip |
|
491 diff --git a/subdir/f1 b/subdir/f1 |
|
492 1 hunks, 1 lines changed |
|
493 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
494 diff --git a/subdir/f2 b/subdir/f2 |
|
495 1 hunks, 1 lines changed |
|
496 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
497 % no |
|
498 diff --git a/subdir/f1 b/subdir/f1 |
|
499 1 hunks, 1 lines changed |
|
500 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
501 diff --git a/subdir/f2 b/subdir/f2 |
|
502 1 hunks, 1 lines changed |
|
503 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
504 % f, quit |
|
505 diff --git a/subdir/f1 b/subdir/f1 |
|
506 1 hunks, 1 lines changed |
|
507 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
508 diff --git a/subdir/f2 b/subdir/f2 |
|
509 1 hunks, 1 lines changed |
|
510 examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
511 abort: user quit |
|
512 % s, all |
|
513 diff --git a/subdir/f1 b/subdir/f1 |
|
514 1 hunks, 1 lines changed |
|
515 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
516 diff --git a/subdir/f2 b/subdir/f2 |
|
517 1 hunks, 1 lines changed |
|
518 examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
519 |
|
520 changeset: 20:d2d8c25276a8 |
|
521 tag: tip |
|
522 user: test |
|
523 date: Thu Jan 01 00:00:18 1970 +0000 |
|
524 summary: x |
|
525 |
|
526 diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2 |
|
527 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
528 +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
529 @@ -1,1 +1,2 @@ |
|
530 b |
|
531 +b |
|
532 |
|
533 % f |
|
534 diff --git a/subdir/f1 b/subdir/f1 |
|
535 1 hunks, 1 lines changed |
|
536 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
537 |
|
538 changeset: 21:1013f51ce32f |
|
539 tag: tip |
|
540 user: test |
|
541 date: Thu Jan 01 00:00:19 1970 +0000 |
|
542 summary: y |
|
543 |
|
544 diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1 |
|
545 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
546 +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
547 @@ -1,1 +1,2 @@ |
|
548 a |
|
549 +a |
|
550 |
|
551 % preserve chmod +x |
|
552 diff --git a/subdir/f1 b/subdir/f1 |
|
553 old mode 100644 |
|
554 new mode 100755 |
|
555 1 hunks, 1 lines changed |
|
556 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
557 @@ -1,2 +1,3 @@ |
|
558 a |
|
559 a |
|
560 +a |
|
561 record this change to 'subdir/f1'? [Ynsfdaq?] |
|
562 |
|
563 changeset: 22:5df857735621 |
|
564 tag: tip |
|
565 user: test |
|
566 date: Thu Jan 01 00:00:20 1970 +0000 |
|
567 summary: z |
|
568 |
|
569 diff --git a/subdir/f1 b/subdir/f1 |
|
570 old mode 100644 |
|
571 new mode 100755 |
|
572 --- a/subdir/f1 |
|
573 +++ b/subdir/f1 |
|
574 @@ -1,2 +1,3 @@ |
|
575 a |
|
576 a |
|
577 +a |
|
578 |
|
579 % preserve execute permission on original |
|
580 diff --git a/subdir/f1 b/subdir/f1 |
|
581 1 hunks, 1 lines changed |
|
582 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
583 @@ -1,3 +1,4 @@ |
|
584 a |
|
585 a |
|
586 a |
|
587 +b |
|
588 record this change to 'subdir/f1'? [Ynsfdaq?] |
|
589 |
|
590 changeset: 23:a4ae36a78715 |
|
591 tag: tip |
|
592 user: test |
|
593 date: Thu Jan 01 00:00:21 1970 +0000 |
|
594 summary: aa |
|
595 |
|
596 diff --git a/subdir/f1 b/subdir/f1 |
|
597 --- a/subdir/f1 |
|
598 +++ b/subdir/f1 |
|
599 @@ -1,3 +1,4 @@ |
|
600 a |
|
601 a |
|
602 a |
|
603 +b |
|
604 |
|
605 % preserve chmod -x |
|
606 diff --git a/subdir/f1 b/subdir/f1 |
|
607 old mode 100755 |
|
608 new mode 100644 |
|
609 1 hunks, 1 lines changed |
|
610 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
611 @@ -2,3 +2,4 @@ |
|
612 a |
|
613 a |
|
614 b |
|
615 +c |
|
616 record this change to 'subdir/f1'? [Ynsfdaq?] |
|
617 |
|
618 changeset: 24:1460f6e47966 |
|
619 tag: tip |
|
620 user: test |
|
621 date: Thu Jan 01 00:00:22 1970 +0000 |
|
622 summary: ab |
|
623 |
|
624 diff --git a/subdir/f1 b/subdir/f1 |
|
625 old mode 100755 |
|
626 new mode 100644 |
|
627 --- a/subdir/f1 |
|
628 +++ b/subdir/f1 |
|
629 @@ -2,3 +2,4 @@ |
|
630 a |
|
631 a |
|
632 b |
|
633 +c |
|
634 |
|
635 % abort early when a merge is in progress |
|
636 1 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
637 marked working directory as branch thatbranch |
|
638 5 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
639 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
640 (branch merge, don't forget to commit) |
|
641 |
|
642 abort: cannot partially commit a merge (use hg commit instead) |
|
643 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
644 % with win32ext |
|
645 diff --git a/subdir/f1 b/subdir/f1 |
|
646 1 hunks, 1 lines changed |
|
647 examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
648 @@ -3,3 +3,4 @@ |
|
649 a |
|
650 b |
|
651 c |
|
652 +d |
|
653 record this change to 'subdir/f1'? [Ynsfdaq?] |
|
654 |
|
655 changeset: 26:5bacc1f6e9cf |
|
656 tag: tip |
|
657 parent: 24:1460f6e47966 |
|
658 user: test |
|
659 date: Thu Jan 01 00:00:23 1970 +0000 |
|
660 summary: w1 |
|
661 |
|
662 diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1 |
|
663 --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 |
|
664 +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
665 @@ -3,3 +3,4 @@ |
|
666 a |
|
667 b |
|
668 c |
|
669 +d |
|
670 |
|