equal
deleted
inserted
replaced
549 phases: 2 draft |
549 phases: 2 draft |
550 mq: 3 unapplied |
550 mq: 3 unapplied |
551 |
551 |
552 $ echo c > b |
552 $ echo c > b |
553 $ hg strip tip |
553 $ hg strip tip |
554 abort: local changes found |
554 abort: uncommitted changes |
555 [255] |
555 [255] |
556 $ hg strip tip --keep |
556 $ hg strip tip --keep |
557 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
557 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
558 $ hg log --graph |
558 $ hg log --graph |
559 @ changeset: 0:9ab35a2d17cb |
559 @ changeset: 0:9ab35a2d17cb |
701 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
701 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
702 (activating bookmark B) |
702 (activating bookmark B) |
703 $ echo a > a |
703 $ echo a > a |
704 $ hg add a |
704 $ hg add a |
705 $ hg strip -B B |
705 $ hg strip -B B |
706 abort: local changes found |
706 abort: uncommitted changes |
707 [255] |
707 [255] |
708 $ hg bookmarks |
708 $ hg bookmarks |
709 * B 6:ff43616e5d0f |
709 * B 6:ff43616e5d0f |
710 |
710 |
711 Make sure no one adds back a -b option: |
711 Make sure no one adds back a -b option: |