Show More
@@ -334,7 +334,7 b' record chunk' | |||||
334 | >>> lines.insert(1, 'foo\n') |
|
334 | >>> lines.insert(1, 'foo\n') | |
335 | >>> lines.append('bar\n') |
|
335 | >>> lines.append('bar\n') | |
336 | >>> open('a', 'w').writelines(lines) |
|
336 | >>> open('a', 'w').writelines(lines) | |
337 |
$ hg record -d '1 1 |
|
337 | $ hg record -d '10 1' -m rectest a<<EOF | |
338 | > y |
|
338 | > y | |
339 | > y |
|
339 | > y | |
340 | > n |
|
340 | > n | |
@@ -355,7 +355,7 b' record chunk' | |||||
355 | record change 2/2 to 'a'? [Ynesfdaq?] |
|
355 | record change 2/2 to 'a'? [Ynesfdaq?] | |
356 |
|
356 | |||
357 | $ hg identify |
|
357 | $ hg identify | |
358 | d17e03c92c97+ tip |
|
358 | 5f5eb23505c3+ tip | |
359 | $ hg status |
|
359 | $ hg status | |
360 | M a |
|
360 | M a | |
361 | A r |
|
361 | A r | |
@@ -363,7 +363,7 b' record chunk' | |||||
363 | Cat modified file a |
|
363 | Cat modified file a | |
364 |
|
364 | |||
365 | $ cat a |
|
365 | $ cat a | |
366 |
expand $Id: a,v |
|
366 | expand $Id: a,v 5f5eb23505c3 1970/01/01 00:00:10 test $ | |
367 | foo |
|
367 | foo | |
368 | do not process $Id: |
|
368 | do not process $Id: | |
369 | xxx $ |
|
369 | xxx $ | |
@@ -372,8 +372,8 b' Cat modified file a' | |||||
372 | Diff remaining chunk |
|
372 | Diff remaining chunk | |
373 |
|
373 | |||
374 | $ hg diff a |
|
374 | $ hg diff a | |
375 |
diff -r |
|
375 | diff -r 5f5eb23505c3 a | |
376 |
--- a/a |
|
376 | --- a/a Thu Jan 01 00:00:09 1970 -0000 | |
377 | +++ b/a * (glob) |
|
377 | +++ b/a * (glob) | |
378 | @@ -2,3 +2,4 @@ |
|
378 | @@ -2,3 +2,4 @@ | |
379 | foo |
|
379 | foo | |
@@ -391,7 +391,7 b' Record all chunks in file a' | |||||
391 |
|
391 | |||
392 | - do not use "hg record -m" here! |
|
392 | - do not use "hg record -m" here! | |
393 |
|
393 | |||
394 |
$ hg record -l msg -d '1 |
|
394 | $ hg record -l msg -d '11 1' a<<EOF | |
395 | > y |
|
395 | > y | |
396 | > y |
|
396 | > y | |
397 | > y |
|
397 | > y | |
@@ -419,7 +419,7 b' File a should be clean' | |||||
419 | rollback and revert expansion |
|
419 | rollback and revert expansion | |
420 |
|
420 | |||
421 | $ cat a |
|
421 | $ cat a | |
422 |
expand $Id: a,v |
|
422 | expand $Id: a,v 78e0a02d76aa 1970/01/01 00:00:11 test $ | |
423 | foo |
|
423 | foo | |
424 | do not process $Id: |
|
424 | do not process $Id: | |
425 | xxx $ |
|
425 | xxx $ | |
@@ -460,14 +460,14 b' Only z should be overwritten' | |||||
460 |
|
460 | |||
461 | record added file alone |
|
461 | record added file alone | |
462 |
|
462 | |||
463 |
$ hg -v record -l msg -d '1 |
|
463 | $ hg -v record -l msg -d '12 2' r<<EOF | |
464 | > y |
|
464 | > y | |
465 | > EOF |
|
465 | > EOF | |
466 | diff --git a/r b/r |
|
466 | diff --git a/r b/r | |
467 | new file mode 100644 |
|
467 | new file mode 100644 | |
468 | examine changes to 'r'? [Ynesfdaq?] |
|
468 | examine changes to 'r'? [Ynesfdaq?] | |
469 | r |
|
469 | r | |
470 |
committed changeset 3:8 |
|
470 | committed changeset 3:82a2f715724d | |
471 | overwriting r expanding keywords |
|
471 | overwriting r expanding keywords | |
472 | - status call required for dirstate.normallookup() check |
|
472 | - status call required for dirstate.normallookup() check | |
473 | $ hg status r |
|
473 | $ hg status r | |
@@ -484,14 +484,14 b' record added keyword ignored file' | |||||
484 |
|
484 | |||
485 | $ echo '$Id$' > i |
|
485 | $ echo '$Id$' > i | |
486 | $ hg add i |
|
486 | $ hg add i | |
487 |
$ hg --verbose record -d '1 1 |
|
487 | $ hg --verbose record -d '13 1' -m recignored<<EOF | |
488 | > y |
|
488 | > y | |
489 | > EOF |
|
489 | > EOF | |
490 | diff --git a/i b/i |
|
490 | diff --git a/i b/i | |
491 | new file mode 100644 |
|
491 | new file mode 100644 | |
492 | examine changes to 'i'? [Ynesfdaq?] |
|
492 | examine changes to 'i'? [Ynesfdaq?] | |
493 | i |
|
493 | i | |
494 |
committed changeset 3: |
|
494 | committed changeset 3:9f40ceb5a072 | |
495 | $ cat i |
|
495 | $ cat i | |
496 | $Id$ |
|
496 | $Id$ | |
497 | $ hg -q rollback |
|
497 | $ hg -q rollback | |
@@ -502,14 +502,14 b' amend' | |||||
502 |
|
502 | |||
503 | $ echo amend >> a |
|
503 | $ echo amend >> a | |
504 | $ echo amend >> b |
|
504 | $ echo amend >> b | |
505 |
$ hg -q commit -d '1 1 |
|
505 | $ hg -q commit -d '14 1' -m 'prepare amend' | |
506 |
|
506 | |||
507 |
$ hg --debug commit --amend -d '1 1 |
|
507 | $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords | |
508 | overwriting a expanding keywords |
|
508 | overwriting a expanding keywords | |
509 | $ hg -q id |
|
509 | $ hg -q id | |
510 | a71343332ea9 |
|
510 | 577e60613a88 | |
511 | $ head -1 a |
|
511 | $ head -1 a | |
512 |
expand $Id: a,v |
|
512 | expand $Id: a,v 577e60613a88 1970/01/01 00:00:15 test $ | |
513 |
|
513 | |||
514 | $ hg -q strip -n tip |
|
514 | $ hg -q strip -n tip | |
515 |
|
515 |
General Comments 0
You need to be logged in to leave comments.
Login now