Mercurial > evolve
comparison tests/test-topic-tutorial.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 | fd039a7f0c3c |
| children | 671b9beb471e 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 486 $ hg update food | 486 $ hg update food |
| 487 switching to topic food | 487 switching to topic food |
| 488 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 488 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 489 | 489 |
| 490 $ hg rebase | 490 $ hg rebase |
| 491 rebasing 1:13900241408b food "adding condiments" | 491 rebasing 1:13900241408b "adding condiments" (food) |
| 492 merging shopping | 492 merging shopping |
| 493 switching to topic food | 493 switching to topic food |
| 494 rebasing 2:287de11b401f food "adding fruits" | 494 rebasing 2:287de11b401f "adding fruits" (food) |
| 495 merging shopping | 495 merging shopping |
| 496 | 496 |
| 497 $ hg log --graph | 497 $ hg log --graph |
| 498 @ changeset: 5:2d50db8b5b4c | 498 @ changeset: 5:2d50db8b5b4c |
| 499 | tag: tip | 499 | tag: tip |
| 1053 penwidth=2.0]; | 1053 penwidth=2.0]; |
| 1054 } | 1054 } |
| 1055 #endif | 1055 #endif |
| 1056 | 1056 |
| 1057 $ hg rebase | 1057 $ hg rebase |
| 1058 rebasing 6:183984ef46d1 tools "Adding hammer" | 1058 rebasing 6:183984ef46d1 "Adding hammer" (tools) |
| 1059 merging shopping | 1059 merging shopping |
| 1060 switching to topic tools | 1060 switching to topic tools |
| 1061 rebasing 7:cffff85af537 tools "Adding saw" | 1061 rebasing 7:cffff85af537 "Adding saw" (tools) |
| 1062 merging shopping | 1062 merging shopping |
| 1063 rebasing 8:34255b455dac tools "Adding drill" | 1063 rebasing 8:34255b455dac "Adding drill" (tools) |
| 1064 merging shopping | 1064 merging shopping |
| 1065 | 1065 |
| 1066 But what about the other topic? You can use 'hg topics --verbose' to see | 1066 But what about the other topic? You can use 'hg topics --verbose' to see |
| 1067 information about all the topics: | 1067 information about all the topics: |
| 1068 | 1068 |
| 1075 Pushing that topic would create a new head, and therefore will be prevented: | 1075 Pushing that topic would create a new head, and therefore will be prevented: |
| 1076 | 1076 |
| 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 [20] | 1082 [255] |
| 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: |
| 1088 | 1088 |
| 1089 $ hg rebase -b drinks | 1089 $ hg rebase -b drinks |
| 1090 rebasing 9:8dfa45bd5e0c drinks "Adding apple juice" | 1090 rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) |
| 1091 merging shopping | 1091 merging shopping |
| 1092 switching to topic drinks | 1092 switching to topic drinks |
| 1093 rebasing 10:70dfa201ed73 drinks "Adding orange juice" | 1093 rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) |
| 1094 merging shopping | 1094 merging shopping |
| 1095 switching to topic tools | 1095 switching to topic tools |
| 1096 | 1096 |
| 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 [20] | 1102 [255] |
| 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 |
| 1775 | 1775 |
| 1776 $ hg up s4 | 1776 $ hg up s4 |
| 1777 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1777 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1778 | 1778 |
| 1779 $ hg rebase | 1779 $ hg rebase |
| 1780 rebasing 19:d5c51ee5762a tools "Adding saw" | 1780 rebasing 19:d5c51ee5762a "Adding saw" (tools) |
| 1781 merging shopping | 1781 merging shopping |
| 1782 rebasing 20:bae3758e46bf tools "Adding drill" | 1782 rebasing 20:bae3758e46bf "Adding drill" (tools) |
| 1783 merging shopping | 1783 merging shopping |
| 1784 | 1784 |
| 1785 $ hg stack | 1785 $ hg stack |
| 1786 ### topic: tools | 1786 ### topic: tools |
| 1787 ### target: default (branch), 2 behind | 1787 ### target: default (branch), 2 behind |