equal
deleted
inserted
replaced
411 |
411 |
412 $ echo bar > d |
412 $ echo bar > d |
413 $ hg amend |
413 $ hg amend |
414 |
414 |
415 $ hg up c41c793e0ef1 --hidden |
415 $ hg up c41c793e0ef1 --hidden |
416 updating to a hidden changeset c41c793e0ef1 |
|
417 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
418 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
416 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
419 working directory parent is obsolete! (c41c793e0ef1) |
417 working directory parent is obsolete! (c41c793e0ef1) |
420 (use 'hg evolve' to update to its successor: e49523854bc8) |
418 (use 'hg evolve' to update to its successor: e49523854bc8) |
421 |
419 |
422 $ echo foobar > d |
420 $ echo foobar > d |
423 $ hg amend |
421 $ hg amend |
424 2 new content-divergent changesets |
|
425 $ hg glog --hidden |
422 $ hg glog --hidden |
426 @ 6:9c1631e352d9 added d |
423 @ 6:9c1631e352d9 added d |
427 | () draft |
424 | () draft |
428 | * 5:e49523854bc8 added d |
425 | o 5:e49523854bc8 added d |
429 |/ () draft |
426 |/ () draft |
430 | x 4:c41c793e0ef1 added d |
427 | x 4:c41c793e0ef1 added d |
431 |/ () draft |
428 |/ () draft |
432 o 3:ca1b80f7960a added c |
429 o 3:ca1b80f7960a added c |
433 | () draft |
430 | () draft |
454 working directory is now at 9c1631e352d9 |
451 working directory is now at 9c1631e352d9 |
455 |
452 |
456 $ hg glog --hidden |
453 $ hg glog --hidden |
457 @ 6:9c1631e352d9 added d |
454 @ 6:9c1631e352d9 added d |
458 | () draft |
455 | () draft |
459 | * 5:e49523854bc8 added d |
456 | o 5:e49523854bc8 added d |
460 |/ () draft |
457 |/ () draft |
461 | x 4:c41c793e0ef1 added d |
458 | x 4:c41c793e0ef1 added d |
462 |/ () draft |
459 |/ () draft |
463 o 3:ca1b80f7960a added c |
460 o 3:ca1b80f7960a added c |
464 | () draft |
461 | () draft |
477 rebasing 6:9c1631e352d9 "added d" (tip) |
474 rebasing 6:9c1631e352d9 "added d" (tip) |
478 |
475 |
479 $ hg glog |
476 $ hg glog |
480 @ 7:517d4375cb72 added d |
477 @ 7:517d4375cb72 added d |
481 | () draft |
478 | () draft |
482 | * 5:e49523854bc8 added d |
479 | o 5:e49523854bc8 added d |
483 | | () draft |
480 | | () draft |
484 | o 3:ca1b80f7960a added c |
481 | o 3:ca1b80f7960a added c |
485 | | () draft |
482 | | () draft |
486 | o 2:b1661037fa25 added b |
483 | o 2:b1661037fa25 added b |
487 |/ () draft |
484 |/ () draft |
508 working directory is now at 517d4375cb72 |
505 working directory is now at 517d4375cb72 |
509 |
506 |
510 $ hg glog |
507 $ hg glog |
511 @ 7:517d4375cb72 added d |
508 @ 7:517d4375cb72 added d |
512 | () draft |
509 | () draft |
513 | * 5:e49523854bc8 added d |
510 | o 5:e49523854bc8 added d |
514 | | () draft |
511 | | () draft |
515 | o 3:ca1b80f7960a added c |
512 | o 3:ca1b80f7960a added c |
516 | | () draft |
513 | | () draft |
517 | o 2:b1661037fa25 added b |
514 | o 2:b1661037fa25 added b |
518 |/ () draft |
515 |/ () draft |
529 $ hg add c |
526 $ hg add c |
530 $ hg amend |
527 $ hg amend |
531 $ hg glog |
528 $ hg glog |
532 @ 8:8fd1c4bd144c added d |
529 @ 8:8fd1c4bd144c added d |
533 | () draft |
530 | () draft |
534 | * 5:e49523854bc8 added d |
531 | o 5:e49523854bc8 added d |
535 | | () draft |
532 | | () draft |
536 | o 3:ca1b80f7960a added c |
533 | o 3:ca1b80f7960a added c |
537 | | () draft |
534 | | () draft |
538 | o 2:b1661037fa25 added b |
535 | o 2:b1661037fa25 added b |
539 |/ () draft |
536 |/ () draft |
572 stopped the interrupted evolve |
569 stopped the interrupted evolve |
573 working directory is now at ca1b80f7960a |
570 working directory is now at ca1b80f7960a |
574 |
571 |
575 XXX: we should have preserved the wdir to be at rev 8 |
572 XXX: we should have preserved the wdir to be at rev 8 |
576 $ hg glog |
573 $ hg glog |
577 * 8:8fd1c4bd144c added d |
574 o 8:8fd1c4bd144c added d |
578 | () draft |
575 | () draft |
579 | * 5:e49523854bc8 added d |
576 | o 5:e49523854bc8 added d |
580 | | () draft |
577 | | () draft |
581 | @ 3:ca1b80f7960a added c |
578 | @ 3:ca1b80f7960a added c |
582 | | () draft |
579 | | () draft |
583 | o 2:b1661037fa25 added b |
580 | o 2:b1661037fa25 added b |
584 |/ () draft |
581 |/ () draft |