Mercurial > evolve
changeset 6882:3ac0e0375509 stable
tests: small fixes to the user-visible text in test-topic-tutorial.t
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 02 Oct 2024 19:52:23 +0400 |
| parents | beee3d9a129a |
| children | 61e8bd377791 |
| files | tests/test-topic-tutorial.t |
| diffstat | 1 files changed, 23 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Wed Oct 02 19:50:43 2024 +0400 +++ b/tests/test-topic-tutorial.t Wed Oct 02 19:52:23 2024 +0400 @@ -20,7 +20,7 @@ $ cat >> .hg/hgrc << EOF > [ui] - > user= Shopping Master + > user = Shopping Master > EOF $ cat >> shopping << EOF @@ -43,7 +43,7 @@ $ cd client $ cat >> .hg/hgrc << EOF > [ui] - > user= Tutorial User + > user = Tutorial User > EOF #if docgraph-ext $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore @@ -100,7 +100,7 @@ marked working directory as topic: food Much like a named branch, our topic is active but it does not contain any -changeset yet: +changesets yet: $ hg topics * food (0 changesets) @@ -713,7 +713,7 @@ Keep working within topics ========================== -Making sure all your new local commit are made within a topic will help you +Making sure all your new local commits are made within a topic will help you organize your work. It is possible to ensure this through the Mercurial configuration. @@ -724,10 +724,10 @@ > topic-mode = enforce > EOF -You can also use `hg config --edit` to update your mercurial configuration. +You can also use `hg config --edit` to update your Mercurial configuration. -Once enforcement is turned on. New local commit will be denied if no topic is active. +Once enforcement is turned on, new local commits will be denied if no topic is active. $ echo sickle >> shopping $ hg commit -m 'Adding sickle' @@ -764,7 +764,7 @@ $ echo drill >> shopping $ hg commit -m 'Adding drill' -But we are not sure we will actually go to the hardware store, so in the +But we are not sure if we will actually go to the hardware store, so in the meantime, we want to extend the list with drinks. We go back to the official default branch and start a new topic: @@ -815,7 +815,7 @@ nothing to rebase [1] -We simulate independant contributions to the repo with this +We simulate independent contributions to the repo with this activity: $ cd ../server @@ -832,7 +832,7 @@ $ hg commit -m 'add a pair of shoes' $ cd ../client -Let's discover what other people did contribute: +Let's discover what other people have contributed: $ hg pull pulling from $TESTTMP/server (glob) @@ -1063,14 +1063,14 @@ rebasing 8:34255b455dac tools "Adding drill" merging shopping -But what about the other topic? You can use 'hg topics --verbose' to see +But what about the other topic? You can use ``hg topics --verbose`` to see information about all the topics: $ hg topics --verbose drinks (on branch: default, 2 changesets, 2 behind) * tools (on branch: default, 3 changesets) -The "2 behind" is telling you that there are 2 new changesets over the base of the topic. +The "2 behind" is telling you that there are 2 new changesets on top of the base of the topic. Pushing that topic would create a new head, and therefore will be prevented: @@ -1083,7 +1083,7 @@ Even after a rebase, pushing all active topics at the same time would publish -them to the default branch, and then mercurial would complain about the +them to the default branch, and then Mercurial would complain about the multiple *public* heads it would create on that branch: $ hg rebase -b drinks @@ -1113,7 +1113,7 @@ added 2 changesets with 2 changes to 1 files 2 new obsolescence markers -The published topic has now faded out, and the other is now marked as +The published topic has now faded out, and the other is now marked as being "behind": $ hg topics --verbose @@ -1133,7 +1133,7 @@ Navigating within your stack ---------------------------- -As we saw before `stack` displays changesets on your current topic in a clean way: +As we saw before ``stack`` displays changesets on your current topic in a clean way: $ hg topics --verbose * tools (on branch: default, 3 changesets, 2 behind) @@ -1146,9 +1146,9 @@ s1: Adding hammer s0^ add a pair of shoes (base) -You can navigate in your current stack with `previous` and `next`. +You can navigate in your current stack with ``previous`` and ``next``. -`previous` will bring you back to the parent of the topic head. +``previous`` will bring you back to the parent of the topic head. $ hg previous 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1162,7 +1162,7 @@ s1: Adding hammer s0^ add a pair of shoes (base) -`next` will move you forward to the topic head. +``next`` will move you forward to the topic head. $ hg next 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1176,7 +1176,7 @@ s1: Adding hammer s0^ add a pair of shoes (base) -You can also directly jump to a changeset within your stack with the revset `t#`. +You can also directly jump to a changeset within your stack with the revset ``s<number>``. $ hg update s1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1364,9 +1364,9 @@ s1@ Adding hammer to the shopping list (current) s0^ add a pair of shoes (base) -It's easy to stabilize the situation, `next` has an `--evolve` option. It will -do the necessary relocation of `s2` and `s3` over the new `s1` without having -to do that rebase by hand.: +It's easy to stabilize the situation, ``next`` has an ``--evolve`` option +(turned on by default nowadays). It will do the necessary relocation of `s2` +and `s3` over the new `s1` without having to do that rebase by hand: $ hg next --evolve move:[s2] Adding saw @@ -1396,7 +1396,7 @@ s1: Adding hammer to the shopping list s0^ add a pair of shoes (base) -Let's take a look at `hg log` once again: +Let's take a look at ``hg log`` once again: $ hg log -G -r "s0::" @ changeset: 20:bae3758e46bf @@ -1832,7 +1832,7 @@ 8 new obsolescence markers Pushing the new topic branch to a non-publishing server did not require ---force. As long as new heads are on their own topic, Mercurial will not +``--force``. As long as new heads are on their own topic, Mercurial will not complain about them. From another client, we will get them with their topic: