##// END OF EJS Templates
tests: use regular expressions instead of helpers
Nicolas Dumazet -
r11907:863567a1 default
parent child Browse files
Show More
@@ -1,5 +1,3 b''
1 $ . $TESTDIR/helpers.sh
2
3 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
4 $ echo "rebase=" >> $HGRCPATH
2 $ echo "rebase=" >> $HGRCPATH
5 $ echo "bookmarks=" >> $HGRCPATH
3 $ echo "bookmarks=" >> $HGRCPATH
@@ -38,8 +36,8 b' bookmark list'
38
36
39 rebase
37 rebase
40
38
41 $ hg rebase -s two -d one 2>&1 | cleanrebase
39 $ hg rebase -s two -d one
42 saved backup bundle to
40 saved backup bundle to .*
43
41
44 $ hg log
42 $ hg log
45 changeset: 3:9163974d1cb5
43 changeset: 3:9163974d1cb5
@@ -1,4 +1,3 b''
1 $ . $TESTDIR/helpers.sh
2 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
3 $ echo "bookmarks=" >> $HGRCPATH
2 $ echo "bookmarks=" >> $HGRCPATH
4 $ echo "mq=" >> $HGRCPATH
3 $ echo "mq=" >> $HGRCPATH
@@ -50,8 +49,8 b' bookmarks updated?'
50
49
51 strip to revision 1
50 strip to revision 1
52
51
53 $ hg strip 1 | hidebackup
52 $ hg strip 1
54 saved backup bundle to
53 saved backup bundle to .*
55
54
56 list bookmarks
55 list bookmarks
57
56
@@ -1,5 +1,3 b''
1 $ . $TESTDIR/helpers.sh
2
3 $ checkundo()
1 $ checkundo()
4 > {
2 > {
5 > if [ -f .hg/store/undo ]; then
3 > if [ -f .hg/store/undo ]; then
@@ -733,9 +731,9 b' strip'
733 $ echo x>x
731 $ echo x>x
734 $ hg ci -Ama
732 $ hg ci -Ama
735 adding x
733 adding x
736 $ hg strip tip | hidebackup
734 $ hg strip tip
737 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
735 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
738 saved backup bundle to
736 saved backup bundle to .*
739 $ hg unbundle .hg/strip-backup/*
737 $ hg unbundle .hg/strip-backup/*
740 adding changesets
738 adding changesets
741 adding manifests
739 adding manifests
@@ -750,14 +748,14 b' strip with local changes, should complai'
750 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
748 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
751 $ echo y>y
749 $ echo y>y
752 $ hg add y
750 $ hg add y
753 $ hg strip tip | hidebackup
751 $ hg strip tip
754 abort: local changes found
752 abort: local changes found
755
753
756 --force strip with local changes
754 --force strip with local changes
757
755
758 $ hg strip -f tip | hidebackup
756 $ hg strip -f tip
759 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
757 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
760 saved backup bundle to
758 saved backup bundle to .*
761
759
762
760
763 cd b; hg qrefresh
761 cd b; hg qrefresh
@@ -1110,9 +1108,9 b' strip again'
1110 date: Thu Jan 01 00:00:00 1970 +0000
1108 date: Thu Jan 01 00:00:00 1970 +0000
1111 summary: add foo
1109 summary: add foo
1112
1110
1113 $ hg strip 1 | hidebackup
1111 $ hg strip 1
1114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1115 saved backup bundle to
1113 saved backup bundle to .*
1116 $ checkundo strip
1114 $ checkundo strip
1117 $ hg log
1115 $ hg log
1118 changeset: 1:20cbbe65cff7
1116 changeset: 1:20cbbe65cff7
General Comments 0
You need to be logged in to leave comments. Login now