513 pushing to ../other-new/ |
513 pushing to ../other-new/ |
514 searching for changes |
514 searching for changes |
515 abort: Trying to push latecomer changeset: 6db5e282cb91! |
515 abort: Trying to push latecomer changeset: 6db5e282cb91! |
516 (use 'hg stabilize' to get a stable history (or --force to proceed)) |
516 (use 'hg stabilize' to get a stable history (or --force to proceed)) |
517 [255] |
517 [255] |
|
518 |
|
519 Check hg commit --amend compat |
|
520 |
|
521 $ hg up 'desc(obsol_c)' |
|
522 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
523 $ mkcommit f |
|
524 created new head |
|
525 $ echo 42 >> f |
|
526 $ hg commit --amend --traceback |
|
527 saved backup bundle to $TESTTMP/local/.hg/strip-backup/0b1b6dd009c0-amend-backup.hg |
|
528 $ hg glog |
|
529 @ changeset: 13:3734a65252e6 |
|
530 | tag: tip |
|
531 | parent: 10:2033b4e49474 |
|
532 | user: test |
|
533 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
534 | summary: add f |
|
535 | |
|
536 | o changeset: 12:6db5e282cb91 |
|
537 |/ parent: 10:2033b4e49474 |
|
538 | user: test |
|
539 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
540 | summary: add obsol_d''' |
|
541 | |
|
542 | o changeset: 11:9468a5f5d8b2 |
|
543 |/ user: test |
|
544 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
545 | summary: add obsol_d'' |
|
546 | |
|
547 o changeset: 10:2033b4e49474 |
|
548 | parent: 4:725c380fe99b |
|
549 | user: test |
|
550 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
551 | summary: add obsol_c |
|
552 | |
|
553 o changeset: 4:725c380fe99b |
|
554 | parent: 1:7c3bad9141dc |
|
555 | user: test |
|
556 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
557 | summary: add obsol_c' |
|
558 | |
|
559 o changeset: 1:7c3bad9141dc |
|
560 | user: test |
|
561 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
562 | summary: add b |
|
563 | |
|
564 o changeset: 0:1f0dee641bb7 |
|
565 user: test |
|
566 date: Thu Jan 01 00:00:00 1970 +0000 |
|
567 summary: add a |
|
568 |
|
569 $ hg debugsuccessors |
|
570 0b1b6dd009c0 3734a65252e6 |
|
571 0d3f46688ccc 2033b4e49474 |
|
572 0d3f46688ccc 725c380fe99b |
|
573 159dfc9fa5d3 9468a5f5d8b2 |
|
574 1f0dee641bb7 83b5778897ad |
|
575 4538525df7e2 0d3f46688ccc |
|
576 83b5778897ad 000000000000 |
|
577 909a0fb57e5d 159dfc9fa5d3 |
|
578 9468a5f5d8b2 6db5e282cb91 |
|
579 95de7fc6918d 909a0fb57e5d |
|
580 a7a6f2b5d8a5 95de7fc6918d |