Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 5718:77b184ee60b5 stable
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 | d0f73113fcc0 |
| children | 7ee15bf011d6 |
comparison
equal
deleted
inserted
replaced
| 5717:38ab502ad94e | 5718:77b184ee60b5 |
|---|---|
| 1077 $ hg push --rev drinks | 1077 $ hg push --rev drinks |
| 1078 pushing to $TESTTMP/server (glob) | 1078 pushing to $TESTTMP/server (glob) |
| 1079 searching for changes | 1079 searching for changes |
| 1080 abort: push creates new remote head 70dfa201ed73 | 1080 abort: push creates new remote head 70dfa201ed73 |
| 1081 (merge or see 'hg help push' for details about pushing new heads) | 1081 (merge or see 'hg help push' for details about pushing new heads) |
| 1082 [255] | 1082 [20] |
| 1083 | 1083 |
| 1084 | 1084 |
| 1085 Even after a rebase, pushing all active topics at the same time would publish | 1085 Even after a rebase, pushing all active topics at the same time would publish |
| 1086 them to the default branch, and then mercurial would complain about the | 1086 them to the default branch, and then mercurial would complain about the |
| 1087 multiple *public* heads it would create on that branch: | 1087 multiple *public* heads it would create on that branch: |
| 1097 $ hg push | 1097 $ hg push |
| 1098 pushing to $TESTTMP/server (glob) | 1098 pushing to $TESTTMP/server (glob) |
| 1099 searching for changes | 1099 searching for changes |
| 1100 abort: push creates new remote head 4cd7c1591a67 | 1100 abort: push creates new remote head 4cd7c1591a67 |
| 1101 (merge or see 'hg help push' for details about pushing new heads) | 1101 (merge or see 'hg help push' for details about pushing new heads) |
| 1102 [255] | 1102 [20] |
| 1103 | 1103 |
| 1104 Publishing only one of them is allowed (as long as it does not create a new | 1104 Publishing only one of them is allowed (as long as it does not create a new |
| 1105 branch head as we just saw in the previous case): | 1105 branch head as we just saw in the previous case): |
| 1106 | 1106 |
| 1107 $ hg push -r drinks | 1107 $ hg push -r drinks |