--- a/tests/test-push-warn.t Mon Nov 23 10:38:05 2020 -0800
+++ b/tests/test-push-warn.t Mon Nov 23 16:39:53 2020 -0800
@@ -33,7 +33,7 @@
remote has heads on branch 'default' that are not known locally: 1c9246a22a0a
abort: push creates new remote head 1e108cc5548c
(pull and merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push --debug ../a
pushing to ../a
@@ -51,7 +51,7 @@
1e108cc5548c
abort: push creates new remote head 1e108cc5548c
(pull and merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg pull ../a
pulling from ../a
@@ -68,7 +68,7 @@
searching for changes
abort: push creates new remote head 1e108cc5548c
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -121,7 +121,7 @@
searching for changes
abort: push creates new remote head 6346d66eb9f5
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push -r 2 ../c
pushing to ../c
@@ -134,7 +134,7 @@
searching for changes
abort: push creates new remote head a5dda829a167
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push -v -r 3 -r 4 ../c
pushing to ../c
@@ -144,7 +144,7 @@
ee8fbc7a0295
abort: push creates new remote head a5dda829a167
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push -v -f -r 3 -r 4 ../c
pushing to ../c
@@ -234,14 +234,14 @@
searching for changes
abort: push creates new remote branches: c
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
$ hg push -r 4 -r 5 ../f
pushing to ../f
searching for changes
abort: push creates new remote branches: c
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
Multiple new branches:
@@ -255,14 +255,14 @@
searching for changes
abort: push creates new remote branches: c, d
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
$ hg push -r 4 -r 6 ../f
pushing to ../f
searching for changes
abort: push creates new remote branches: c, d
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
$ cd ../g
@@ -278,7 +278,7 @@
searching for changes
abort: push creates new remote head 0b715ef6ff8f on branch 'a'
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
Push replacement head on existing branches:
@@ -355,7 +355,7 @@
searching for changes
abort: push creates new remote branches: e
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
Using --new-branch to push new named branch:
@@ -383,7 +383,7 @@
searching for changes
abort: push creates new branch 'f' with multiple heads
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push --branch f --new-branch --force ../f
pushing to ../f
searching for changes
@@ -427,7 +427,7 @@
remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847
abort: push creates new remote head 97bd0c84d346
(pull and merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx
$ hg -R i push h
pushing to h
@@ -435,7 +435,7 @@
remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others
abort: push creates new remote head 97bd0c84d346
(pull and merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg -R i push h -v
pushing to h
searching for changes
@@ -444,7 +444,7 @@
97bd0c84d346
abort: push creates new remote head 97bd0c84d346
(pull and merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
Check prepush logic with merged branches:
@@ -479,7 +479,7 @@
searching for changes
abort: push creates new remote branches: b
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
Prepush -r should not allow you to sneak in new heads:
@@ -515,7 +515,7 @@
searching for changes
abort: push creates new remote head 451211cc22b0 on branch 'a'
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ cd ..
@@ -765,14 +765,14 @@
searching for changes
abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg push inner -r4 -r5
pushing to inner
searching for changes
abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ hg in inner
comparing with inner
@@ -788,7 +788,7 @@
running fail-push hook
abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
(merge or see 'hg help push' for details about pushing new heads)
- [255]
+ [20]
$ cd ..
@@ -817,7 +817,7 @@
searching for changes
abort: push creates new remote branches: foo (1 closed)
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
When there is more than one closed branches
$ hg -q branch bar
@@ -830,7 +830,7 @@
searching for changes
abort: push creates new remote branches: bar, foo (2 closed)
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
When there are more than one new branches and not all are closed
$ hg -q branch bar1
@@ -842,6 +842,6 @@
searching for changes
abort: push creates new remote branches: bar, bar1, foo (2 closed)
(use 'hg push --new-branch' to create new remote branches)
- [255]
+ [20]
$ cd ..