diff options
Diffstat (limited to 'tests/test-push-warn.t')
| -rw-r--r-- | tests/test-push-warn.t | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t index 37c1589..f659d30 100644 --- a/tests/test-push-warn.t +++ b/tests/test-push-warn.t @@ -37,7 +37,6 @@ searching: 2 queries query 2; still undecided: 1, sample size is: 1 2 total queries - listing keys for "bookmarks" new remote heads on branch 'default' new remote head 1e108cc5548c abort: push creates new remote head 1e108cc5548c! @@ -117,7 +116,6 @@ pushing to ../c searching for changes no changes found - [1] $ hg push -r 3 ../c pushing to ../c @@ -395,7 +393,6 @@ Check prepush logic with merged branches: $ hg init j $ hg -R j branch a marked working directory as branch a - (branches are permanent and global, did you want a bookmark?) $ echo init > j/foo $ hg -R j ci -Am init adding foo @@ -406,7 +403,6 @@ Check prepush logic with merged branches: $ hg -R j ci -m a1 $ hg -R k branch b marked working directory as branch b - (branches are permanent and global, did you want a bookmark?) $ echo b > k/foo $ hg -R k ci -m b $ hg -R k up 0 @@ -470,13 +466,11 @@ Check prepush with new branch head on former topo non-head: $ cd n $ hg branch A marked working directory as branch A - (branches are permanent and global, did you want a bookmark?) $ echo a >a $ hg ci -Ama adding a $ hg branch B marked working directory as branch B - (branches are permanent and global, did you want a bookmark?) $ echo b >b $ hg ci -Amb adding b @@ -549,13 +543,11 @@ Check prepush with new branch head on former topo head: $ cd o $ hg branch A marked working directory as branch A - (branches are permanent and global, did you want a bookmark?) $ echo a >a $ hg ci -Ama adding a $ hg branch B marked working directory as branch B - (branches are permanent and global, did you want a bookmark?) $ echo b >b $ hg ci -Amb adding b @@ -637,7 +629,6 @@ but child is on different branch: $ cd p $ hg branch A marked working directory as branch A - (branches are permanent and global, did you want a bookmark?) $ echo a0 >a $ hg ci -Ama0 adding a @@ -647,7 +638,6 @@ but child is on different branch: 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg branch B marked working directory as branch B - (branches are permanent and global, did you want a bookmark?) $ echo b0 >b $ hg ci -Amb0 adding b @@ -662,7 +652,6 @@ but child is on different branch: 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg branch -f B marked working directory as branch B - (branches are permanent and global, did you want a bookmark?) $ echo a3 >a $ hg ci -ma3 created new head @@ -670,7 +659,6 @@ but child is on different branch: 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg branch -f A marked working directory as branch A - (branches are permanent and global, did you want a bookmark?) $ echo b3 >b $ hg ci -mb3 created new head @@ -728,5 +716,3 @@ outgoing: searching for changes no changes found [1] - - $ cd .. |