Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 3102:6604d96fc73c mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output change in rebase This backed out changeset d12c82fd1143 and a couple of other changes. The change are not relevant in Mercurial < 4.4/
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 17:30:20 +0200
parents ccfcacc5ee7c
children a867d59ea97a
comparison
equal deleted inserted replaced
3101:7f949debd50d 3102:6604d96fc73c
481 $ hg update food 481 $ hg update food
482 switching to topic food 482 switching to topic food
483 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 483 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
484 484
485 $ hg rebase 485 $ hg rebase
486 rebasing 1:13900241408b "adding condiments" (food) 486 rebasing 1:13900241408b "adding condiments"
487 merging shopping 487 merging shopping
488 switching to topic food 488 switching to topic food
489 rebasing 2:287de11b401f "adding fruits" (food) 489 rebasing 2:287de11b401f "adding fruits"
490 merging shopping 490 merging shopping
491 491
492 $ hg log --graph 492 $ hg log --graph
493 @ changeset: 5:2d50db8b5b4c 493 @ changeset: 5:2d50db8b5b4c
494 | tag: tip 494 | tag: tip
1032 penwidth=2.0]; 1032 penwidth=2.0];
1033 } 1033 }
1034 #endif 1034 #endif
1035 1035
1036 $ hg rebase 1036 $ hg rebase
1037 rebasing 6:183984ef46d1 "Adding hammer" (tools) 1037 rebasing 6:183984ef46d1 "Adding hammer"
1038 merging shopping 1038 merging shopping
1039 switching to topic tools 1039 switching to topic tools
1040 rebasing 7:cffff85af537 "Adding saw" (tools) 1040 rebasing 7:cffff85af537 "Adding saw"
1041 merging shopping 1041 merging shopping
1042 rebasing 8:34255b455dac "Adding drill" (tools) 1042 rebasing 8:34255b455dac "Adding drill"
1043 merging shopping 1043 merging shopping
1044 1044
1045 But what about the other topic? You can use 'hg topics --verbose' to see 1045 But what about the other topic? You can use 'hg topics --verbose' to see
1046 information about all the topics: 1046 information about all the topics:
1047 1047
1064 Even after a rebase, pushing all active topics at the same time would publish 1064 Even after a rebase, pushing all active topics at the same time would publish
1065 them to the default branch, and then mercurial would complain about the 1065 them to the default branch, and then mercurial would complain about the
1066 multiple *public* heads it would create on that branch: 1066 multiple *public* heads it would create on that branch:
1067 1067
1068 $ hg rebase -b drinks 1068 $ hg rebase -b drinks
1069 rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) 1069 rebasing 9:8dfa45bd5e0c "Adding apple juice"
1070 merging shopping 1070 merging shopping
1071 switching to topic drinks 1071 switching to topic drinks
1072 rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) 1072 rebasing 10:70dfa201ed73 "Adding orange juice"
1073 merging shopping 1073 merging shopping
1074 switching to topic tools 1074 switching to topic tools
1075 1075
1076 $ hg push 1076 $ hg push
1077 pushing to $TESTTMP/server (glob) 1077 pushing to $TESTTMP/server (glob)
1752 1752
1753 $ hg up t4 1753 $ hg up t4
1754 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1754 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1755 1755
1756 $ hg rebase 1756 $ hg rebase
1757 rebasing 19:d5c51ee5762a "Adding saw" (tools) 1757 rebasing 19:d5c51ee5762a "Adding saw"
1758 merging shopping 1758 merging shopping
1759 rebasing 20:bae3758e46bf "Adding drill" (tools) 1759 rebasing 20:bae3758e46bf "Adding drill"
1760 merging shopping 1760 merging shopping
1761 1761
1762 $ hg stack 1762 $ hg stack
1763 ### topic: tools 1763 ### topic: tools
1764 ### target: default (branch), 2 behind 1764 ### target: default (branch), 2 behind