equal
deleted
inserted
replaced
457 R c |
457 R c |
458 R f |
458 R f |
459 R g |
459 R g |
460 R m |
460 R m |
461 R n |
461 R n |
|
462 |
|
463 Testing the --revert flag of `hg uncommit` |
|
464 |
|
465 When working directory before uncommit is clean |
|
466 |
|
467 $ hg amend |
|
468 $ hg status |
|
469 ? b |
|
470 |
|
471 $ hg diff -c . --stat |
|
472 aa | 1 + |
|
473 b | 1 - |
|
474 c | 1 - |
|
475 d | 1 + |
|
476 e | 1 + |
|
477 f | 1 - |
|
478 ff | 1 + |
|
479 g | 1 - |
|
480 h | 1 + |
|
481 j | 1 + |
|
482 k | 1 + |
|
483 l | 1 + |
|
484 m | 1 - |
|
485 n | 1 - |
|
486 o | 1 + |
|
487 15 files changed, 9 insertions(+), 6 deletions(-) |
|
488 $ hg uncommit --revert --all |
|
489 new changeset is empty |
|
490 (use 'hg prune .' to remove it) |
|
491 $ hg status |
|
492 |
|
493 When working directory is dirty before uncommit |
|
494 |
|
495 $ echo foo > a |
|
496 $ echo foo > b |
|
497 $ echo foo > c |
|
498 $ hg status |
|
499 M a |
|
500 M b |
|
501 M c |
|
502 $ hg amend |
|
503 $ echo foo > foo |
|
504 $ hg add foo |
|
505 $ hg status |
|
506 A foo |
|
507 |
|
508 $ hg uncommit --revert --all |
|
509 new changeset is empty |
|
510 (use 'hg prune .' to remove it) |
|
511 $ hg status |
|
512 ? foo |