comparison tests/test-minitopic.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 1328195f76a9
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
83 created new head 83 created new head
84 (consider using topic for lightweight branches. See 'hg help topic') 84 (consider using topic for lightweight branches. See 'hg help topic')
85 $ hg push enabled 85 $ hg push enabled
86 pushing to http://localhost:$HGPORT/ 86 pushing to http://localhost:$HGPORT/
87 searching for changes 87 searching for changes
88 abort: push creates new remote head 22c9514ed811 88 abort: push creates new remote head 22c9514ed811!
89 (merge or see 'hg help push' for details about pushing new heads) 89 (merge or see 'hg help push' for details about pushing new heads)
90 [20] 90 [255]
91 $ hg push disabled 91 $ hg push disabled
92 pushing to http://localhost:$HGPORT2/ 92 pushing to http://localhost:$HGPORT2/
93 searching for changes 93 searching for changes
94 abort: push creates new remote head 22c9514ed811 94 abort: push creates new remote head 22c9514ed811!
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 97
98 $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort 98 $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort
99 default 0ab6d544d0efd629fda056601cfe95e73d1af210 99 default 0ab6d544d0efd629fda056601cfe95e73d1af210
100 $ hg debugdownload http://localhost:$HGPORT2/?cmd=branchmap | sort 100 $ hg debugdownload http://localhost:$HGPORT2/?cmd=branchmap | sort
101 default 0ab6d544d0efd629fda056601cfe95e73d1af210 101 default 0ab6d544d0efd629fda056601cfe95e73d1af210
149 active topic 'topic_A' grew its first changeset 149 active topic 'topic_A' grew its first changeset
150 (see 'hg help topics' for more information) 150 (see 'hg help topics' for more information)
151 $ hg push disabled 151 $ hg push disabled
152 pushing to http://localhost:$HGPORT2/ 152 pushing to http://localhost:$HGPORT2/
153 searching for changes 153 searching for changes
154 abort: push creates new remote head f31af349535e 154 abort: push creates new remote head f31af349535e!
155 (merge or see 'hg help push' for details about pushing new heads) 155 (merge or see 'hg help push' for details about pushing new heads)
156 [20] 156 [255]
157 $ hg push enabled 157 $ hg push enabled
158 pushing to http://localhost:$HGPORT/ 158 pushing to http://localhost:$HGPORT/
159 searching for changes 159 searching for changes
160 remote: adding changesets 160 remote: adding changesets
161 remote: adding manifests 161 remote: adding manifests
218 summary: c_A0 218 summary: c_A0
219 219
220 $ hg push enabled 220 $ hg push enabled
221 pushing to http://localhost:$HGPORT/ 221 pushing to http://localhost:$HGPORT/
222 searching for changes 222 searching for changes
223 abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A' 223 abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A'!
224 (merge or see 'hg help push' for details about pushing new heads) 224 (merge or see 'hg help push' for details about pushing new heads)
225 [20] 225 [255]
226 $ hg push disabled 226 $ hg push disabled
227 pushing to http://localhost:$HGPORT2/ 227 pushing to http://localhost:$HGPORT2/
228 searching for changes 228 searching for changes
229 remote: adding changesets 229 remote: adding changesets
230 remote: adding manifests 230 remote: adding manifests