comparison tests/test-push-checkheads-unpushed-D3.t @ 5892:34cd08a46b6d mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents 08c30eef85d3
children 669270305ccb 1328195f76a9
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
89 -------------- 89 --------------
90 90
91 $ hg push --rev 'desc(A1)' 91 $ hg push --rev 'desc(A1)'
92 pushing to $TESTTMP/D3/server (glob) 92 pushing to $TESTTMP/D3/server (glob)
93 searching for changes 93 searching for changes
94 abort: push creates new remote head f6082bc4ffef 94 abort: push creates new remote head f6082bc4ffef!
95 (merge or see 'hg help push' for details about pushing new heads) 95 (merge or see 'hg help push' for details about pushing new heads)
96 [20] 96 [255]
97 $ hg push --rev 'desc(B1)' 97 $ hg push --rev 'desc(B1)'
98 pushing to $TESTTMP/D3/server (glob) 98 pushing to $TESTTMP/D3/server (glob)
99 searching for changes 99 searching for changes
100 abort: push creates new remote head 25c56d33e4c4 100 abort: push creates new remote head 25c56d33e4c4!
101 (merge or see 'hg help push' for details about pushing new heads) 101 (merge or see 'hg help push' for details about pushing new heads)
102 [20] 102 [255]
103 103
104 Extra testing 104 Extra testing
105 ------------- 105 -------------
106 106
107 In this case, even a bare push is creating more heads 107 In this case, even a bare push is creating more heads
108 108
109 $ hg push 109 $ hg push
110 pushing to $TESTTMP/D3/server (glob) 110 pushing to $TESTTMP/D3/server (glob)
111 searching for changes 111 searching for changes
112 abort: push creates new remote head 25c56d33e4c4 112 abort: push creates new remote head 25c56d33e4c4!
113 (merge or see 'hg help push' for details about pushing new heads) 113 (merge or see 'hg help push' for details about pushing new heads)
114 [20] 114 [255]
115 115
116 $ cd ../.. 116 $ cd ../..