--- a/tests/test-branch-option Sat Aug 14 03:06:52 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# test branch selection options
-hg init branch
-cd branch
-hg branch a
-echo a > foo
-hg ci -d '0 0' -Ama
-echo a2 > foo
-hg ci -d '0 0' -ma2
-hg up 0
-hg branch c
-echo c > foo
-hg ci -d '0 0' -mc
-hg tag -l z
-cd ..
-hg clone -r 0 branch branch2
-cd branch2
-hg up 0
-hg branch b
-echo b > foo
-hg ci -d '0 0' -mb
-hg up 0
-hg --encoding utf-8 branch æ
-echo ae1 > foo
-hg ci -d '0 0' -mae1
-hg up 0
-hg --encoding utf-8 branch -f æ
-echo ae2 > foo
-hg ci -d '0 0' -mae2
-hg up 0
-hg branch -f b
-echo b2 > foo
-hg ci -d '0 0' -mb2
-
-echo unknown branch and fallback
-hg in -qbz
-hg in -q ../branch#z
-hg out -qbz
-echo in rev c branch a
-hg in -qr c ../branch#a
-hg in -qr c -b a
-echo out branch .
-hg out -q ../branch#.
-hg out -q -b .
-echo out branch . non-ascii
-hg --encoding utf-8 up æ
-hg --encoding latin1 out -q ../branch#.
-hg --encoding latin1 out -q -b .
-echo clone branch b
-cd ..
-hg clone branch2#b branch3
-hg -q -R branch3 heads b
-hg -q -R branch3 parents
-rm -rf branch3
-echo clone rev a branch b
-hg clone -r a branch2#b branch3
-hg -q -R branch3 heads b
-hg -q -R branch3 parents
-rm -rf branch3
--- a/tests/test-branch-option.out Sat Aug 14 03:06:52 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-marked working directory as branch a
-adding foo
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch c
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
-updating to branch a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch b
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch æ
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch æ
-created new head
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-marked working directory as branch b
-created new head
-unknown branch and fallback
-abort: unknown branch 'z'!
-2:f25d57ab0566
-abort: unknown branch 'z'!
-in rev c branch a
-1:dd6e60a716c6
-2:f25d57ab0566
-1:dd6e60a716c6
-2:f25d57ab0566
-out branch .
-1:b84708d77ab7
-4:65511d0e2b55
-1:b84708d77ab7
-4:65511d0e2b55
-out branch . non-ascii
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-2:df5a44224d4e
-3:4f4a5125ca10
-2:df5a44224d4e
-3:4f4a5125ca10
-clone branch b
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 1 files (+1 heads)
-updating to branch b
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-2:65511d0e2b55
-1:b84708d77ab7
-2:65511d0e2b55
-clone rev a branch b
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 1 files (+1 heads)
-updating to branch a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-2:65511d0e2b55
-1:b84708d77ab7
-0:5b65ba7c951d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-branch-option.t Sat Aug 14 03:08:02 2010 +0200
@@ -0,0 +1,127 @@
+test branch selection options
+
+ $ hg init branch
+ $ cd branch
+ $ hg branch a
+ marked working directory as branch a
+ $ echo a > foo
+ $ hg ci -d '0 0' -Ama
+ adding foo
+ $ echo a2 > foo
+ $ hg ci -d '0 0' -ma2
+ $ hg up 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg branch c
+ marked working directory as branch c
+ $ echo c > foo
+ $ hg ci -d '0 0' -mc
+ $ hg tag -l z
+ $ cd ..
+ $ hg clone -r 0 branch branch2
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ updating to branch a
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cd branch2
+ $ hg up 0
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg branch b
+ marked working directory as branch b
+ $ echo b > foo
+ $ hg ci -d '0 0' -mb
+ $ hg up 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg --encoding utf-8 branch æ
+ marked working directory as branch æ
+ $ echo ae1 > foo
+ $ hg ci -d '0 0' -mae1
+ $ hg up 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg --encoding utf-8 branch -f æ
+ marked working directory as branch æ
+ $ echo ae2 > foo
+ $ hg ci -d '0 0' -mae2
+ created new head
+ $ hg up 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg branch -f b
+ marked working directory as branch b
+ $ echo b2 > foo
+ $ hg ci -d '0 0' -mb2
+ created new head
+
+unknown branch and fallback
+
+ $ hg in -qbz
+ abort: unknown branch 'z'!
+ $ hg in -q ../branch#z
+ 2:f25d57ab0566
+ $ hg out -qbz
+ abort: unknown branch 'z'!
+
+in rev c branch a
+
+ $ hg in -qr c ../branch#a
+ 1:dd6e60a716c6
+ 2:f25d57ab0566
+ $ hg in -qr c -b a
+ 1:dd6e60a716c6
+ 2:f25d57ab0566
+
+out branch .
+
+ $ hg out -q ../branch#.
+ 1:b84708d77ab7
+ 4:65511d0e2b55
+ $ hg out -q -b .
+ 1:b84708d77ab7
+ 4:65511d0e2b55
+
+out branch . non-ascii
+
+ $ hg --encoding utf-8 up æ
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg --encoding latin1 out -q ../branch#.
+ 2:df5a44224d4e
+ 3:4f4a5125ca10
+ $ hg --encoding latin1 out -q -b .
+ 2:df5a44224d4e
+ 3:4f4a5125ca10
+
+clone branch b
+
+ $ cd ..
+ $ hg clone branch2#b branch3
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 3 changes to 1 files (+1 heads)
+ updating to branch b
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg -q -R branch3 heads b
+ 2:65511d0e2b55
+ 1:b84708d77ab7
+ $ hg -q -R branch3 parents
+ 2:65511d0e2b55
+ $ rm -rf branch3
+
+clone rev a branch b
+
+ $ hg clone -r a branch2#b branch3
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 3 changes to 1 files (+1 heads)
+ updating to branch a
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg -q -R branch3 heads b
+ 2:65511d0e2b55
+ 1:b84708d77ab7
+ $ hg -q -R branch3 parents
+ 0:5b65ba7c951d
+ $ rm -rf branch3