Mercurial > evolve

comparison tests/test-topic-push.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents 08c30eef85d3 9a41c3c293ae
children
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
45 $ cd client 45 $ cd client
46 $ echo aaa > aaa 46 $ echo aaa > aaa
47 $ hg add aaa 47 $ hg add aaa
48 $ hg commit -m 'CA' 48 $ hg commit -m 'CA'
49 $ hg outgoing -G 49 $ hg outgoing -G
50 comparing with $TESTTMP/main (glob) 50 comparing with $TESTTMP/main
51 searching for changes 51 searching for changes
52 @ 0 default draft CA 52 @ 0 default draft CA
53 53
54 $ hg push 54 $ hg push
55 pushing to $TESTTMP/main (glob) 55 pushing to $TESTTMP/main
56 searching for changes 56 searching for changes
57 adding changesets 57 adding changesets
58 adding manifests 58 adding manifests
59 adding file changes 59 adding file changes
60 added 1 changesets with 1 changes to 1 files 60 added 1 changesets with 1 changes to 1 files
70 $ hg add ccc 70 $ hg add ccc
71 $ hg commit -m 'CC' 71 $ hg commit -m 'CC'
72 created new head 72 created new head
73 (consider using topic for lightweight branches. See 'hg help topic') 73 (consider using topic for lightweight branches. See 'hg help topic')
74 $ hg outgoing -G 74 $ hg outgoing -G
75 comparing with $TESTTMP/main (glob) 75 comparing with $TESTTMP/main
76 searching for changes 76 searching for changes
77 @ 2 default draft CC 77 @ 2 default draft CC
78 78
79 o 1 default draft CB 79 o 1 default draft CB
80 80
81 $ hg push 81 $ hg push
82 pushing to $TESTTMP/main (glob) 82 pushing to $TESTTMP/main
83 searching for changes 83 searching for changes
84 abort: push creates new remote head 9fe81b7f425d! 84 abort: push creates new remote head 9fe81b7f425d!
85 (merge or see 'hg help push' for details about pushing new heads) 85 (merge or see 'hg help push' for details about pushing new heads)
86 [255] 86 [255]
87 $ hg outgoing -r 'desc(CB)' -G 87 $ hg outgoing -r 'desc(CB)' -G
88 comparing with $TESTTMP/main (glob) 88 comparing with $TESTTMP/main
89 searching for changes 89 searching for changes
90 o 1 default draft CB 90 o 1 default draft CB
91 91
92 $ hg push -r 'desc(CB)' 92 $ hg push -r 'desc(CB)'
93 pushing to $TESTTMP/main (glob) 93 pushing to $TESTTMP/main
94 searching for changes 94 searching for changes
95 adding changesets 95 adding changesets
96 adding manifests 96 adding manifests
97 adding file changes 97 adding file changes
98 added 1 changesets with 1 changes to 1 files 98 added 1 changesets with 1 changes to 1 files
99 99
100 Pushing a new branch 100 Pushing a new branch
101 101
102 $ hg branch mountain 102 $ hg branch double//slash
103 marked working directory as branch mountain 103 marked working directory as branch double//slash
104 (branches are permanent and global, did you want a bookmark?) 104 (branches are permanent and global, did you want a bookmark?)
105 $ hg commit --amend 105 $ hg commit --amend
106 $ hg outgoing -G 106 $ hg outgoing -G
107 comparing with $TESTTMP/main (glob) 107 comparing with $TESTTMP/main
108 searching for changes 108 searching for changes
109 @ 3 mountain draft CC 109 @ 3 double//slash draft CC
110 110
111 $ hg push 111 $ hg push
112 pushing to $TESTTMP/main (glob) 112 pushing to $TESTTMP/main
113 searching for changes 113 searching for changes
114 abort: push creates new remote branches: mountain! 114 abort: push creates new remote branches: double//slash//!
115 (use 'hg push --new-branch' to create new remote branches) 115 (use 'hg push --new-branch' to create new remote branches)
116 [255] 116 [255]
117 $ hg push --new-branch 117 $ hg push --new-branch
118 pushing to $TESTTMP/main (glob) 118 pushing to $TESTTMP/main
119 searching for changes 119 searching for changes
120 adding changesets 120 adding changesets
121 adding manifests 121 adding manifests
122 adding file changes 122 adding file changes
123 added 1 changesets with 1 changes to 1 files (+1 heads) 123 added 1 changesets with 1 changes to 1 files (+1 heads)
124 1 new obsolescence markers 124 1 new obsolescence markers
125 125
126 Including on non-publishing 126 Including on non-publishing
127 127
128 $ hg push --new-branch draft 128 $ hg push --new-branch draft
129 pushing to $TESTTMP/draft (glob) 129 pushing to $TESTTMP/draft
130 searching for changes 130 searching for changes
131 adding changesets 131 adding changesets
132 adding manifests 132 adding manifests
133 adding file changes 133 adding file changes
134 added 3 changesets with 3 changes to 3 files (+1 heads) 134 added 3 changesets with 3 changes to 3 files (+1 heads)
150 active topic 'babar' grew its first changeset 150 active topic 'babar' grew its first changeset
151 (see 'hg help topics' for more information) 151 (see 'hg help topics' for more information)
152 $ hg log -G # keep track of phase because I saw some strange bug during developement 152 $ hg log -G # keep track of phase because I saw some strange bug during developement
153 @ 4 default babar draft CD 153 @ 4 default babar draft CD
154 | 154 |
155 | o 3 mountain public CC 155 | o 3 double//slash public CC
156 |/ 156 |/
157 | o 1 default public CB 157 | o 1 default public CB
158 |/ 158 |/
159 o 0 default public CA 159 o 0 default public CA
160 160
161 161
162 Pushing a new topic to a non publishing server should not be seen as a new head 162 Pushing a new topic to a non publishing server should not be seen as a new head
163 163
164 $ hg push draft 164 $ hg push draft
165 pushing to $TESTTMP/draft (glob) 165 pushing to $TESTTMP/draft
166 searching for changes 166 searching for changes
167 adding changesets 167 adding changesets
168 adding manifests 168 adding manifests
169 adding file changes 169 adding file changes
170 added 1 changesets with 1 changes to 1 files (+1 heads) 170 added 1 changesets with 1 changes to 1 files (+1 heads)
171 $ hg log -G 171 $ hg log -G
172 @ 4 default babar draft CD 172 @ 4 default babar draft CD
173 | 173 |
174 | o 3 mountain public CC 174 | o 3 double//slash public CC
175 |/ 175 |/
176 | o 1 default public CB 176 | o 1 default public CB
177 |/ 177 |/
178 o 0 default public CA 178 o 0 default public CA
179 179
180 push --topic 180 push --topic
181 181
182 $ hg log -G -R $TESTTMP/draft 182 $ hg log -G -R $TESTTMP/draft
183 o 3 default babar draft CD 183 o 3 default babar draft CD
184 | 184 |
185 | o 2 mountain public CC 185 | o 2 double//slash public CC
186 |/ 186 |/
187 | o 1 default public CB 187 | o 1 default public CB
188 |/ 188 |/
189 o 0 default public CA 189 o 0 default public CA
190 190
200 | 200 |
201 | o 5 default babar draft C'A 201 | o 5 default babar draft C'A
202 | | 202 | |
203 | o 4 default babar draft CD 203 | o 4 default babar draft CD
204 | | 204 | |
205 | | o 3 mountain public CC 205 | | o 3 double//slash public CC
206 | |/ 206 | |/
207 o | 1 default public CB 207 o | 1 default public CB
208 |/ 208 |/
209 o 0 default public CA 209 o 0 default public CA
210 210
238 $ hg log -G -R $TESTTMP/draft 238 $ hg log -G -R $TESTTMP/draft
239 o 4 default babar draft C'A 239 o 4 default babar draft C'A
240 | 240 |
241 o 3 default babar draft CD 241 o 3 default babar draft CD
242 | 242 |
243 | o 2 mountain public CC 243 | o 2 double//slash public CC
244 |/ 244 |/
245 | o 1 default public CB 245 | o 1 default public CB
246 |/ 246 |/
247 o 0 default public CA 247 o 0 default public CA
248 248
250 $ hg strip --config extensions.strip= -R $TESTTMP/draft --no-backup -r 7a9e34dbf547: --quiet 250 $ hg strip --config extensions.strip= -R $TESTTMP/draft --no-backup -r 7a9e34dbf547: --quiet
251 251
252 Pushing a new topic to a publishing server should be seen as a new head 252 Pushing a new topic to a publishing server should be seen as a new head
253 253
254 $ hg push 254 $ hg push
255 pushing to $TESTTMP/main (glob) 255 pushing to $TESTTMP/main
256 searching for changes 256 searching for changes
257 abort: push creates new remote head 67f579af159d! 257 abort: push creates new remote head 67f579af159d!
258 (merge or see 'hg help push' for details about pushing new heads) 258 (merge or see 'hg help push' for details about pushing new heads)
259 [255] 259 [255]
260 $ hg log -G 260 $ hg log -G
261 @ 4 default babar draft CD 261 @ 4 default babar draft CD
262 | 262 |
263 | o 3 mountain public CC 263 | o 3 double//slash public CC
264 |/ 264 |/
265 | o 1 default public CB 265 | o 1 default public CB
266 |/ 266 |/
267 o 0 default public CA 267 o 0 default public CA
268 268
282 $ hg log -G # keep track of phase because I saw some strange bug during developement 282 $ hg log -G # keep track of phase because I saw some strange bug during developement
283 @ 5 default celeste draft CE 283 @ 5 default celeste draft CE
284 | 284 |
285 | o 4 default babar draft CD 285 | o 4 default babar draft CD
286 |/ 286 |/
287 | o 3 mountain public CC 287 | o 3 double//slash 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
306 $ hg log -G 306 $ hg log -G
307 @ 5 default celeste draft CE 307 @ 5 default celeste draft CE
308 | 308 |
309 | o 4 default babar draft CD 309 | o 4 default babar draft CD
310 |/ 310 |/
311 | o 3 mountain public CC 311 | o 3 double//slash public CC
312 |/ 312 |/
313 | o 1 default public CB 313 | o 1 default public CB
314 |/ 314 |/
315 o 0 default public CA 315 o 0 default public CA
316 316
328 $ hg log -G 328 $ hg log -G
329 @ 5 default celeste draft CE 329 @ 5 default celeste draft CE
330 | 330 |
331 | o 4 default babar draft CD 331 | o 4 default babar draft CD
332 |/ 332 |/
333 | o 3 mountain public CC 333 | o 3 double//slash public CC
334 |/ 334 |/
335 | o 1 default public CB 335 | o 1 default public CB
336 |/ 336 |/
337 o 0 default public CA 337 o 0 default public CA
338 338
348 $ hg log -G 348 $ hg log -G
349 @ 5 default celeste draft CE 349 @ 5 default celeste draft CE
350 | 350 |
351 | o 4 default babar draft CD 351 | o 4 default babar draft CD
352 |/ 352 |/
353 | o 3 mountain public CC 353 | o 3 double//slash public CC
354 |/ 354 |/
355 | o 1 default public CB 355 | o 1 default public CB
356 |/ 356 |/
357 o 0 default public CA 357 o 0 default public CA
358 358
372 | 372 |
373 | o 5 default celeste draft CE 373 | o 5 default celeste draft CE
374 | | 374 | |
375 | | o 4 default babar draft CD 375 | | o 4 default babar draft CD
376 | |/ 376 | |/
377 | | o 3 mountain public CC 377 | | o 3 double//slash public CC
378 | |/ 378 | |/
379 o | 1 default public CB 379 o | 1 default public CB
380 |/ 380 |/
381 o 0 default public CA 381 o 0 default public CA
382 382
383 383
384 $ hg push draft 384 $ hg push draft
385 pushing to $TESTTMP/draft (glob) 385 pushing to $TESTTMP/draft
386 searching for changes 386 searching for changes
387 abort: push creates new remote head f0bc62a661be on branch 'default:babar'! 387 abort: push creates new remote head f0bc62a661be on branch 'default//babar'!
388 (merge or see 'hg help push' for details about pushing new heads) 388 (merge or see 'hg help push' for details about pushing new heads)
389 [255] 389 [255]
390 390
391 Multiple heads on a branch merged into a topic branch 391 Multiple heads on a branch merged into a topic branch
392 ----------------------------------------------------- 392 -----------------------------------------------------
414 | | 414 | |
415 | | o 5 default celeste draft CE 415 | | o 5 default celeste draft CE
416 | |/ 416 | |/
417 | | o 4 default babar draft CD 417 | | o 4 default babar draft CD
418 | |/ 418 | |/
419 | | o 3 mountain public CC 419 | | o 3 double//slash public CC
420 | |/ 420 | |/
421 o | 1 default public CB 421 o | 1 default public CB
422 |/ 422 |/
423 o 0 default public CA 423 o 0 default public CA
424 424
425 425
426 Reject when pushing to draft 426 Reject when pushing to draft
427 427
428 $ hg push draft -r . 428 $ hg push draft -r .
429 pushing to $TESTTMP/draft (glob) 429 pushing to $TESTTMP/draft
430 searching for changes 430 searching for changes
431 abort: push creates new remote head 4937c4cad39e! 431 abort: push creates new remote head 4937c4cad39e!
432 (merge or see 'hg help push' for details about pushing new heads) 432 (merge or see 'hg help push' for details about pushing new heads)
433 [255] 433 [255]
434 434
435 Reject when pushing to publishing 435 Reject when pushing to publishing
436 436
437 $ hg push -r . 437 $ hg push -r .
438 pushing to $TESTTMP/main (glob) 438 pushing to $TESTTMP/main
439 searching for changes 439 searching for changes
440 adding changesets 440 adding changesets
441 adding manifests 441 adding manifests
442 adding file changes 442 adding file changes
443 added 3 changesets with 2 changes to 2 files 443 added 3 changesets with 2 changes to 2 files