summaryrefslogtreecommitdiff
path: root/tests/test-newbranch.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-newbranch.t')
-rw-r--r--tests/test-newbranch.t8
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/test-newbranch.t b/tests/test-newbranch.t
index f1099b8..89ecadf 100644
--- a/tests/test-newbranch.t
+++ b/tests/test-newbranch.t
@@ -9,13 +9,11 @@
$ hg ci -m "initial"
$ hg branch foo
marked working directory as branch foo
- (branches are permanent and global, did you want a bookmark?)
$ hg branch
foo
$ hg ci -m "add branch name"
$ hg branch bar
marked working directory as branch bar
- (branches are permanent and global, did you want a bookmark?)
$ hg ci -m "change branch name"
Branch shadowing:
@@ -27,7 +25,6 @@ Branch shadowing:
$ hg branch -f default
marked working directory as branch default
- (branches are permanent and global, did you want a bookmark?)
$ hg ci -m "clear branch name"
created new head
@@ -130,7 +127,6 @@ Test for invalid branch cache:
changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6
branch: foo
tag: tip
- phase: draft
parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8
parent: -1:0000000000000000000000000000000000000000
manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe
@@ -190,7 +186,6 @@ Update with no arguments: tipmost revision of the current branch:
$ hg branch foobar
marked working directory as branch foobar
- (branches are permanent and global, did you want a bookmark?)
$ hg up
abort: branch foobar not found
@@ -200,7 +195,6 @@ Fastforward merge:
$ hg branch ff
marked working directory as branch ff
- (branches are permanent and global, did you want a bookmark?)
$ echo ff > ff
$ hg ci -Am'fast forward'
@@ -262,7 +256,6 @@ Test merging, add 3 default heads and one test head:
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg branch test
marked working directory as branch test
- (branches are permanent and global, did you want a bookmark?)
$ echo e >> e
$ hg ci -Ame
adding e
@@ -327,4 +320,3 @@ Implicit merge with default branch as parent:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
- $ cd ..