Mercurial > evolve

comparison tests/test-topic-push-concurrent-on.t @ 2929:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 9585fac76d2d
children
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
91 (branches are permanent and global, did you want a bookmark?) 91 (branches are permanent and global, did you want a bookmark?)
92 $ hg commit --amend 92 $ hg commit --amend
93 $ hg outgoing -G 93 $ hg outgoing -G
94 comparing with $TESTTMP/main (glob) 94 comparing with $TESTTMP/main (glob)
95 searching for changes 95 searching for changes
96 @ 4 mountain draft CC 96 @ 3 mountain draft CC
97 97
98 $ hg push 98 $ hg push
99 pushing to $TESTTMP/main (glob) 99 pushing to $TESTTMP/main (glob)
100 searching for changes 100 searching for changes
101 abort: push creates new remote branches: mountain! 101 abort: push creates new remote branches: mountain!
106 searching for changes 106 searching for changes
107 adding changesets 107 adding changesets
108 adding manifests 108 adding manifests
109 adding file changes 109 adding file changes
110 added 1 changesets with 1 changes to 1 files (+1 heads) 110 added 1 changesets with 1 changes to 1 files (+1 heads)
111 2 new obsolescence markers 111 1 new obsolescence markers
112 112
113 Including on non-publishing 113 Including on non-publishing
114 114
115 $ hg push --new-branch draft 115 $ hg push --new-branch draft
116 pushing to $TESTTMP/draft (glob) 116 pushing to $TESTTMP/draft (glob)
117 searching for changes 117 searching for changes
118 adding changesets 118 adding changesets
119 adding manifests 119 adding manifests
120 adding file changes 120 adding file changes
121 added 3 changesets with 3 changes to 3 files (+1 heads) 121 added 3 changesets with 3 changes to 3 files (+1 heads)
122 2 new obsolescence markers 122 1 new obsolescence markers
123 123
124 Testing topic behavior 124 Testing topic behavior
125 ====================== 125 ======================
126 126
127 Local peer tests 127 Local peer tests
132 $ hg topic babar 132 $ hg topic babar
133 $ echo aaa > ddd 133 $ echo aaa > ddd
134 $ hg add ddd 134 $ hg add ddd
135 $ hg commit -m 'CD' 135 $ hg commit -m 'CD'
136 $ hg log -G # keep track of phase because I saw some strange bug during developement 136 $ hg log -G # keep track of phase because I saw some strange bug during developement
137 @ 5 default babar draft CD 137 @ 4 default babar draft CD
138 | 138 |
139 | o 4 mountain public CC 139 | o 3 mountain public CC
140 |/ 140 |/
141 | o 1 default public CB 141 | o 1 default public CB
142 |/ 142 |/
143 o 0 default public CA 143 o 0 default public CA
144 144
151 adding changesets 151 adding changesets
152 adding manifests 152 adding manifests
153 adding file changes 153 adding file changes
154 added 1 changesets with 1 changes to 1 files (+1 heads) 154 added 1 changesets with 1 changes to 1 files (+1 heads)
155 $ hg log -G 155 $ hg log -G
156 @ 5 default babar draft CD 156 @ 4 default babar draft CD
157 | 157 |
158 | o 4 mountain public CC 158 | o 3 mountain public CC
159 |/ 159 |/
160 | o 1 default public CB 160 | o 1 default public CB
161 |/ 161 |/
162 o 0 default public CA 162 o 0 default public CA
163 163
169 searching for changes 169 searching for changes
170 abort: push creates new remote head 67f579af159d! 170 abort: push creates new remote head 67f579af159d!
171 (merge or see 'hg help push' for details about pushing new heads) 171 (merge or see 'hg help push' for details about pushing new heads)
172 [255] 172 [255]
173 $ hg log -G 173 $ hg log -G
174 @ 5 default babar draft CD 174 @ 4 default babar draft CD
175 | 175 |
176 | o 4 mountain public CC 176 | o 3 mountain public CC
177 |/ 177 |/
178 | o 1 default public CB 178 | o 1 default public CB
179 |/ 179 |/
180 o 0 default public CA 180 o 0 default public CA
181 181
188 $ hg topic celeste 188 $ hg topic celeste
189 $ echo aaa > eee 189 $ echo aaa > eee
190 $ hg add eee 190 $ hg add eee
191 $ hg commit -m 'CE' 191 $ hg commit -m 'CE'
192 $ hg log -G # keep track of phase because I saw some strange bug during developement 192 $ hg log -G # keep track of phase because I saw some strange bug during developement
193 @ 6 default celeste draft CE 193 @ 5 default celeste draft CE
194 | 194 |
195 | o 5 default babar draft CD 195 | o 4 default babar draft CD
196 |/ 196 |/
197 | o 4 mountain public CC 197 | o 3 mountain public CC
198 |/ 198 |/
199 | o 1 default public CB 199 | o 1 default public CB
200 |/ 200 |/
201 o 0 default public CA 201 o 0 default public CA
202 202
212 searching for changes 212 searching for changes
213 abort: push creates new remote head 84eaf32db6c3! 213 abort: push creates new remote head 84eaf32db6c3!
214 (merge or see 'hg help push' for details about pushing new heads) 214 (merge or see 'hg help push' for details about pushing new heads)
215 [255] 215 [255]
216 $ hg log -G 216 $ hg log -G
217 @ 6 default celeste draft CE 217 @ 5 default celeste draft CE
218 | 218 |
219 | o 5 default babar draft CD 219 | o 4 default babar draft CD
220 |/ 220 |/
221 | o 4 mountain public CC 221 | o 3 mountain public CC
222 |/ 222 |/
223 | o 1 default public CB 223 | o 1 default public CB
224 |/ 224 |/
225 o 0 default public CA 225 o 0 default public CA
226 226
235 remote: adding changesets 235 remote: adding changesets
236 remote: adding manifests 236 remote: adding manifests
237 remote: adding file changes 237 remote: adding file changes
238 remote: added 1 changesets with 1 changes to 1 files (+1 heads) 238 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
239 $ hg log -G 239 $ hg log -G
240 @ 6 default celeste draft CE 240 @ 5 default celeste draft CE
241 | 241 |
242 | o 5 default babar draft CD 242 | o 4 default babar draft CD
243 |/ 243 |/
244 | o 4 mountain public CC 244 | o 3 mountain public CC
245 |/ 245 |/
246 | o 1 default public CB 246 | o 1 default public CB
247 |/ 247 |/
248 o 0 default public CA 248 o 0 default public CA
249 249
255 searching for changes 255 searching for changes
256 abort: push creates new remote head 67f579af159d! 256 abort: push creates new remote head 67f579af159d!
257 (merge or see 'hg help push' for details about pushing new heads) 257 (merge or see 'hg help push' for details about pushing new heads)
258 [255] 258 [255]
259 $ hg log -G 259 $ hg log -G
260 @ 6 default celeste draft CE 260 @ 5 default celeste draft CE
261 | 261 |
262 | o 5 default babar draft CD 262 | o 4 default babar draft CD
263 |/ 263 |/
264 | o 4 mountain public CC 264 | o 3 mountain public CC
265 |/ 265 |/
266 | o 1 default public CB 266 | o 1 default public CB
267 |/ 267 |/
268 o 0 default public CA 268 o 0 default public CA
269 269
276 $ hg topic babar 276 $ hg topic babar
277 $ echo aaa > fff 277 $ echo aaa > fff
278 $ hg add fff 278 $ hg add fff
279 $ hg commit -m 'CF' 279 $ hg commit -m 'CF'
280 $ hg log -G 280 $ hg log -G
281 @ 7 default babar draft CF 281 @ 6 default babar draft CF
282 | 282 |
283 | o 6 default celeste draft CE 283 | o 5 default celeste draft CE
284 | | 284 | |
285 | | o 5 default babar draft CD 285 | | o 4 default babar draft CD
286 | |/ 286 | |/
287 | | o 4 mountain public CC 287 | | o 3 mountain public CC
288 | |/ 288 | |/
289 o | 1 default public CB 289 o | 1 default public CB
290 |/ 290 |/
291 o 0 default public CA 291 o 0 default public CA
292 292
314 $ hg merge 'desc(CG)' 314 $ hg merge 'desc(CG)'
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
316 (branch merge, don't forget to commit) 316 (branch merge, don't forget to commit)
317 $ hg commit -m 'CM' 317 $ hg commit -m 'CM'
318 $ hg log -G 318 $ hg log -G
319 @ 9 default babar draft CM 319 @ 8 default babar draft CM
320 |\ 320 |\
321 | o 8 default draft CG 321 | o 7 default draft CG
322 | | 322 | |
323 o | 7 default babar draft CF 323 o | 6 default babar draft CF
324 | | 324 | |
325 | | o 6 default celeste draft CE 325 | | o 5 default celeste draft CE
326 | |/ 326 | |/
327 | | o 5 default babar draft CD 327 | | o 4 default babar draft CD
328 | |/ 328 | |/
329 | | o 4 mountain public CC 329 | | o 3 mountain public CC
330 | |/ 330 | |/
331 o | 1 default public CB 331 o | 1 default public CB
332 |/ 332 |/
333 o 0 default public CA 333 o 0 default public CA
334 334