Mercurial > evolve
diff tests/test-topic-tutorial.t @ 2969:3d39b8867b29
topics/tuto: spell out `hg topics` entirely
author | Aurélien Campéas |
---|---|
date | Thu, 21 Sep 2017 15:15:24 +0200 |
parents | 946b1baa8c38 |
children | 19e20e86a514 |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Thu Sep 21 15:09:14 2017 +0200 +++ b/tests/test-topic-tutorial.t Thu Sep 21 15:15:24 2017 +0200 @@ -90,12 +90,12 @@ We are about to make some additions to this list and would like to do them within a topic. Creating a new topic is done using the ``topic`` command: - $ hg topic food + $ hg topics food Much like a named branch, our topic is active but it does not contain any changeset yet: - $ hg topic + $ hg topics * food $ hg summary @@ -252,7 +252,7 @@ $ hg update default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg topic + $ hg topics food Note that ``default`` (name of the branch) now refers to the tipmost @@ -329,7 +329,7 @@ switching to topic food 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg topic + $ hg topics * food Updating to any changeset that is part of a topic activates the topic @@ -342,7 +342,7 @@ switching to topic food 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg topic + $ hg topics * food .. Server side activity: @@ -568,7 +568,7 @@ The topic information will disappear when we publish the changesets: - $ hg topic + $ hg topics * food $ hg push @@ -580,13 +580,13 @@ added 2 changesets with 2 changes to 1 files 2 new obsolescence markers - $ hg topic + $ hg topics * food The topic still exists, and any new commit will be in the topic. But note that it is now devoid of any commit. - $ hg topic --list + $ hg topics --list ### topic: food ### branch: default (stack is empty) @@ -681,7 +681,7 @@ From there, the topic has vanished. - $ hg topic + $ hg topics Keep working within topics @@ -725,7 +725,7 @@ We might go shopping in a hardware store in the same go, so let's add some tools to the shopping list within a new topic: - $ hg topic tools + $ hg topics tools $ echo hammer >> shopping $ hg commit -m 'Adding hammer' @@ -742,7 +742,7 @@ $ hg update default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg topic drinks + $ hg topics drinks $ echo 'apple juice' >> shopping $ hg commit -m 'Adding apple juice' @@ -751,7 +751,7 @@ We now have two topics: - $ hg topic + $ hg topics * drinks tools @@ -1029,10 +1029,10 @@ rebasing 8:34255b455dac "Adding drill" merging shopping -But what about the other topic? You can use 'hg topic --verbose' to see +But what about the other topic? You can use 'hg topics --verbose' to see information about all the topics: - $ hg topic --verbose + $ hg topics --verbose drinks (on branch: default, 2 changesets, 2 behind) * tools (on branch: default, 3 changesets) @@ -1081,7 +1081,7 @@ The published topic has now disappeared, and the other is now marked as "behind": - $ hg topic --verbose + $ hg topics --verbose * tools (on branch: default, 3 changesets, 2 behind) $ hg stack