Mercurial > hg
changeset 11864:b2a06ef53b7b
tests: unify test-bookmarks-strip
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Aug 2010 03:00:22 +0200 |
parents | 86ec95b1d37b |
children | 400aa8f28f6b |
files | tests/test-bookmarks-strip tests/test-bookmarks-strip.out tests/test-bookmarks-strip.t |
diffstat | 3 files changed, 61 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-strip Sat Aug 14 02:59:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -#!/bin/sh - -. $TESTDIR/helpers.sh -echo "[extensions]" >> $HGRCPATH -echo "bookmarks=" >> $HGRCPATH -echo "mq=" >> $HGRCPATH - -hg init - -echo qqq>qqq.txt - -echo % add file -hg add - -echo % commit first revision -hg ci -m 1 -u user -d "1 0" - -echo % set bookmark -hg book test - -echo www>>qqq.txt - -echo % commit second revision -hg ci -m 2 -u usr -d "1 0" - -echo % set bookmark -hg book test2 - -echo % update to -2 -hg update -r -2 - -echo eee>>qqq.txt - -echo % commit new head -hg ci -m 3 -u user -d "1 0" - -echo % bookmarks updated? -hg book - -echo % strip to revision 1 -hg strip 1 | hidebackup - -echo % list bookmarks -hg book -
--- a/tests/test-bookmarks-strip.out Sat Aug 14 02:59:48 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -% add file -adding qqq.txt -% commit first revision -% set bookmark -% commit second revision -% set bookmark -% update to -2 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -% commit new head -created new head -% bookmarks updated? - test 1:16b24da7e457 - test2 1:16b24da7e457 -% strip to revision 1 -saved backup bundle to -% list bookmarks - * test 1:9f1b7e78eff8 - * test2 1:9f1b7e78eff8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-bookmarks-strip.t Sat Aug 14 03:00:22 2010 +0200 @@ -0,0 +1,61 @@ + $ . $TESTDIR/helpers.sh + $ echo "[extensions]" >> $HGRCPATH + $ echo "bookmarks=" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH + + $ hg init + + $ echo qqq>qqq.txt + +add file + + $ hg add + adding qqq.txt + +commit first revision + + $ hg ci -m 1 -u user -d "1 0" + +set bookmark + + $ hg book test + + $ echo www>>qqq.txt + +commit second revision + + $ hg ci -m 2 -u usr -d "1 0" + +set bookmark + + $ hg book test2 + +update to -2 + + $ hg update -r -2 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ echo eee>>qqq.txt + +commit new head + + $ hg ci -m 3 -u user -d "1 0" + created new head + +bookmarks updated? + + $ hg book + test 1:16b24da7e457 + test2 1:16b24da7e457 + +strip to revision 1 + + $ hg strip 1 | hidebackup + saved backup bundle to + +list bookmarks + + $ hg book + * test 1:9f1b7e78eff8 + * test2 1:9f1b7e78eff8 +