Mercurial > evolve
comparison tests/test-topic-push.t @ 5682:f0d46ffbf1bb
tests: update exit code in case of push failing because it'd create new heads
CORE-TEST-OUTPUT-UPDATE: 9261f6c1d39b
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 23 Dec 2020 21:34:22 +0800 |
| parents | 12c53d7122a7 |
| children | 73cb6cafc930 442771901e01 |
comparison
equal
deleted
inserted
replaced
| 5681:33994d579c81 | 5682:f0d46ffbf1bb |
|---|---|
| 81 $ hg push | 81 $ hg push |
| 82 pushing to $TESTTMP/main (glob) | 82 pushing to $TESTTMP/main (glob) |
| 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 [20] |
| 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 (glob) |
| 89 searching for changes | 89 searching for changes |
| 90 o 1 default draft CB | 90 o 1 default draft CB |
| 91 | 91 |
| 111 $ hg push | 111 $ hg push |
| 112 pushing to $TESTTMP/main (glob) | 112 pushing to $TESTTMP/main (glob) |
| 113 searching for changes | 113 searching for changes |
| 114 abort: push creates new remote branches: mountain | 114 abort: push creates new remote branches: mountain |
| 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 [20] |
| 117 $ hg push --new-branch | 117 $ hg push --new-branch |
| 118 pushing to $TESTTMP/main (glob) | 118 pushing to $TESTTMP/main (glob) |
| 119 searching for changes | 119 searching for changes |
| 120 adding changesets | 120 adding changesets |
| 121 adding manifests | 121 adding manifests |
| 254 $ hg push | 254 $ hg push |
| 255 pushing to $TESTTMP/main (glob) | 255 pushing to $TESTTMP/main (glob) |
| 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 [20] |
| 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 mountain public CC |
| 264 |/ | 264 |/ |
| 300 $ hg push ssh://user@dummy/draft | 300 $ hg push ssh://user@dummy/draft |
| 301 pushing to ssh://user@dummy/draft | 301 pushing to ssh://user@dummy/draft |
| 302 searching for changes | 302 searching for changes |
| 303 abort: push creates new remote head 84eaf32db6c3 | 303 abort: push creates new remote head 84eaf32db6c3 |
| 304 (merge or see 'hg help push' for details about pushing new heads) | 304 (merge or see 'hg help push' for details about pushing new heads) |
| 305 [255] | 305 [20] |
| 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 |/ |
| 342 $ hg push ssh://user@dummy/main | 342 $ hg push ssh://user@dummy/main |
| 343 pushing to ssh://user@dummy/main | 343 pushing to ssh://user@dummy/main |
| 344 searching for changes | 344 searching for changes |
| 345 abort: push creates new remote head 67f579af159d | 345 abort: push creates new remote head 67f579af159d |
| 346 (merge or see 'hg help push' for details about pushing new heads) | 346 (merge or see 'hg help push' for details about pushing new heads) |
| 347 [255] | 347 [20] |
| 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 |/ |
| 384 $ hg push draft | 384 $ hg push draft |
| 385 pushing to $TESTTMP/draft (glob) | 385 pushing to $TESTTMP/draft (glob) |
| 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 [20] |
| 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 ----------------------------------------------------- |
| 393 | 393 |
| 394 $ hg up 'desc(CA)' | 394 $ hg up 'desc(CA)' |
| 428 $ hg push draft -r . | 428 $ hg push draft -r . |
| 429 pushing to $TESTTMP/draft (glob) | 429 pushing to $TESTTMP/draft (glob) |
| 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 [20] |
| 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 (glob) |