Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 5647:c2fab88e6d60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rebase now produces different "one-line summary" output CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 29 Oct 2020 09:19:37 -0700
parents 74efe8301c74
children 12c53d7122a7
comparison
equal deleted inserted replaced
5646:4c1eb455259f 5647:c2fab88e6d60
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 "adding condiments" (food) 491 rebasing 1:13900241408b food "adding condiments"
492 merging shopping 492 merging shopping
493 switching to topic food 493 switching to topic food
494 rebasing 2:287de11b401f "adding fruits" (food) 494 rebasing 2:287de11b401f food "adding fruits"
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 "Adding hammer" (tools) 1058 rebasing 6:183984ef46d1 tools "Adding hammer"
1059 merging shopping 1059 merging shopping
1060 switching to topic tools 1060 switching to topic tools
1061 rebasing 7:cffff85af537 "Adding saw" (tools) 1061 rebasing 7:cffff85af537 tools "Adding saw"
1062 merging shopping 1062 merging shopping
1063 rebasing 8:34255b455dac "Adding drill" (tools) 1063 rebasing 8:34255b455dac tools "Adding drill"
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
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 "Adding apple juice" (drinks) 1090 rebasing 9:8dfa45bd5e0c drinks "Adding apple juice"
1091 merging shopping 1091 merging shopping
1092 switching to topic drinks 1092 switching to topic drinks
1093 rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) 1093 rebasing 10:70dfa201ed73 drinks "Adding orange juice"
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)
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 "Adding saw" (tools) 1780 rebasing 19:d5c51ee5762a tools "Adding saw"
1781 merging shopping 1781 merging shopping
1782 rebasing 20:bae3758e46bf "Adding drill" (tools) 1782 rebasing 20:bae3758e46bf tools "Adding drill"
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