Mercurial > public > mercurial-scm > hg

diff tests/test-push-warn.t @ 45908:122f0b59f5f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: remove trailing "!" in messages about creating new heads on push Differential Revision: https://phab.mercurial-scm.org/D9380
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 12:42:57 -0800
parents 8d72e29ad1e0
children 9261f6c1d39b
line wrap: on
line diff
--- a/tests/test-push-warn.t	Mon Nov 23 12:31:53 2020 -0800
+++ b/tests/test-push-warn.t	Mon Nov 23 12:42:57 2020 -0800
@@ -31,7 +31,7 @@
   pushing to ../a
   searching for changes
   remote has heads on branch 'default' that are not known locally: 1c9246a22a0a
-  abort: push creates new remote head 1e108cc5548c!
+  abort: push creates new remote head 1e108cc5548c
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -49,7 +49,7 @@
   remote has heads on branch 'default' that are not known locally: 1c9246a22a0a
   new remote heads on branch 'default':
    1e108cc5548c
-  abort: push creates new remote head 1e108cc5548c!
+  abort: push creates new remote head 1e108cc5548c
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -66,7 +66,7 @@
   $ hg push ../a
   pushing to ../a
   searching for changes
-  abort: push creates new remote head 1e108cc5548c!
+  abort: push creates new remote head 1e108cc5548c
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -119,7 +119,7 @@
   $ hg push ../c
   pushing to ../c
   searching for changes
-  abort: push creates new remote head 6346d66eb9f5!
+  abort: push creates new remote head 6346d66eb9f5
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -132,7 +132,7 @@
   $ hg push -r 3 ../c
   pushing to ../c
   searching for changes
-  abort: push creates new remote head a5dda829a167!
+  abort: push creates new remote head a5dda829a167
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -142,7 +142,7 @@
   new remote heads on branch 'default':
    a5dda829a167
    ee8fbc7a0295
-  abort: push creates new remote head a5dda829a167!
+  abort: push creates new remote head a5dda829a167
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -232,14 +232,14 @@
   $ hg push ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote branches: c!
+  abort: push creates new remote branches: c
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
   $ hg push -r 4 -r 5 ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote branches: c!
+  abort: push creates new remote branches: c
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -253,14 +253,14 @@
   $ hg push ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote branches: c, d!
+  abort: push creates new remote branches: c, d
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
   $ hg push -r 4 -r 6 ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote branches: c, d!
+  abort: push creates new remote branches: c, d
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -276,7 +276,7 @@
   $ hg push -r 4 -r 7 ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote head 0b715ef6ff8f on branch 'a'!
+  abort: push creates new remote head 0b715ef6ff8f on branch 'a'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -353,7 +353,7 @@
   $ hg push -r 12 -r 13 ../f
   pushing to ../f
   searching for changes
-  abort: push creates new remote branches: e!
+  abort: push creates new remote branches: e
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -425,7 +425,7 @@
   pushing to h
   searching for changes
   remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847
-  abort: push creates new remote head 97bd0c84d346!
+  abort: push creates new remote head 97bd0c84d346
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx
@@ -433,7 +433,7 @@
   pushing to h
   searching for changes
   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!
+  abort: push creates new remote head 97bd0c84d346
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg -R i push h -v
@@ -442,7 +442,7 @@
   remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847
   new remote heads on branch 'default':
    97bd0c84d346
-  abort: push creates new remote head 97bd0c84d346!
+  abort: push creates new remote head 97bd0c84d346
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -477,7 +477,7 @@
   $ hg -R k push -r a j
   pushing to j
   searching for changes
-  abort: push creates new remote branches: b!
+  abort: push creates new remote branches: b
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -513,7 +513,7 @@
   $ hg push ../l -b b
   pushing to ../l
   searching for changes
-  abort: push creates new remote head 451211cc22b0 on branch 'a'!
+  abort: push creates new remote head 451211cc22b0 on branch 'a'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -763,14 +763,14 @@
   $ hg push inner
   pushing to inner
   searching for changes
-  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'!
+  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
   $ hg push inner -r4 -r5
   pushing to inner
   searching for changes
-  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'!
+  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -786,7 +786,7 @@
   pushing to inner
   searching for changes
   running fail-push hook
-  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'!
+  abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
@@ -815,7 +815,7 @@
   $ hg push ../x
   pushing to ../x
   searching for changes
-  abort: push creates new remote branches: foo (1 closed)!
+  abort: push creates new remote branches: foo (1 closed)
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -828,7 +828,7 @@
   $ hg push ../x
   pushing to ../x
   searching for changes
-  abort: push creates new remote branches: bar, foo (2 closed)!
+  abort: push creates new remote branches: bar, foo (2 closed)
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
@@ -840,7 +840,7 @@
   $ hg push ../x
   pushing to ../x
   searching for changes
-  abort: push creates new remote branches: bar, bar1, foo (2 closed)!
+  abort: push creates new remote branches: bar, bar1, foo (2 closed)
   (use 'hg push --new-branch' to create new remote branches)
   [255]