# HG changeset patch # User Josef 'Jeff' Sipek <jef...@josefsipek.net> # Date 1499601692 -10800 # Sun Jul 09 15:01:32 2017 +0300 # Branch stable # Node ID d3297cb2c810432906d8cf4b45e412f2f87241b0 # Parent c497d62fdcea9861369a15896a1f59d6f3787765 tutorial: fix grammar and spelling
diff --git a/tests/test-topic-tutorial.t b/tests/test-topic-tutorial.t --- a/tests/test-topic-tutorial.t +++ b/tests/test-topic-tutorial.t @@ -42,7 +42,7 @@ their unfinished work. Topic Basics ============ -Let's says we use Mercurial to manage our shopping list:: +Let's say we use Mercurial to manage our shopping list:: $ hg log --graph @ changeset: 0:38da43f0a2ea @@ -52,12 +52,12 @@ Let's says we use Mercurial to manage ou summary: Shopping list -We are about to do some edition to this list and would like to do them within -a topic. Creating a new topic is done using the ``topic`` command:: +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 -As for named branch, our topic is active but it does not contains any +Much like a named branch, our topic is active but it does not contain any changesets yet:: $ hg topic @@ -95,7 +95,7 @@ Our next commit will be part of the acti summary: adding condiments -And future commit will be part of that topic too:: +And future commits will be part of that topic too:: $ cat >> shopping << EOF > Bananas @@ -128,7 +128,7 @@ command:: t1: adding condiments ^ Shopping list -The topic desactivate when we update away from it:: +The topic deactivates when we update away from it:: $ hg up default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -158,7 +158,7 @@ changeset of default without a topic:: summary: Shopping list -And updating back to the topic reactivate it:: +And updating back to the topic reactivates it:: $ hg up food switching to topic food @@ -166,8 +166,8 @@ And updating back to the topic reactivat $ hg topic * food -The name used for updating does not affect the activation of the topic, -updating to a revision part of a topic will activate it in all cases:: +Updating to any changeset that is part of a topic activates the topic +regardless of how the revision was specified:: $ hg up default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -194,8 +194,8 @@ updating to a revision part of a topic w $ hg commit -A -m "Adding clothes" $ cd ../client -Topic will also affect rebase and merge destination. Let's pull the latest -update from the main server:: +The topic will also affect the rebase and the merge destinations. Let's pull +the latest update from the main server:: $ hg pull pulling from $TESTTMP/server (glob) @@ -231,7 +231,7 @@ update from the main server:: summary: Shopping list -The topic head will not be considered when merge from the new head of the +The topic head will not be considered when merging from the new head of the branch:: $ hg up default @@ -278,7 +278,7 @@ But the topic will see that branch head summary: Shopping list -The topic information will fade out when we publish the changesets:: +The topic information will disappear when we publish the changesets:: $ hg topic * food @@ -321,12 +321,12 @@ The topic information will fade out when Working with Multiple Topics ============================ -In the above example, topic are not bring much benefit since you only have one -line of developement. Topic start to be more useful when you have to work on -multiple features are the same time. +In the above example, topics do not bring much benefit since you only have one +line of development. Topics start to be more useful when you have to work on +multiple features at the same time. We might go shopping in a hardware store in the same go, so let's add some -tools to the shopping list withing a new topic:: +tools to the shopping list within a new topic:: $ hg topic tools $ echo hammer >> shopping @@ -336,9 +336,9 @@ tools to the shopping list withing a new $ echo drill >> shopping $ hg ci -m 'Adding drill' -But are not sure to actually go in the hardward 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:: +But we are not sure 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:: $ hg up default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -354,7 +354,7 @@ We now have two topics:: * drinks tools -The information ``hg stack`` command adapt to the active topic:: +The information displayed by ``hg stack`` adapts to the active topic:: $ hg stack ### topic: drinks @@ -373,8 +373,8 @@ The information ``hg stack`` command ada t1: Adding hammer ^ adding fruits -They are seen as independant branch by Mercurial. No rebase or merge betwen -them will be attempted by default:: +They are seen as independent branches by Mercurial. No rebase or merge +between them will be attempted by default:: $ hg rebase nothing to rebase @@ -396,7 +396,7 @@ them will be attempted by default:: $ hg ci -m 'add a pair of shoes' $ cd ../client -Lets see what other people did in the mean time:: +Let's see what other people did in the meantime:: $ hg pull pulling from $TESTTMP/server (glob) @@ -407,7 +407,7 @@ Lets see what other people did in the me added 2 changesets with 2 changes to 1 files (+1 heads) (run 'hg heads' to see heads) -There is new changes! We can simply use ``hg rebase`` to update our +There are new changes! We can simply use ``hg rebase`` to update our changeset on top of the latest:: $ hg rebase @@ -420,16 +420,16 @@ changeset on top of the latest:: merging shopping But what about the other topic? You can use 'hg topic --verbose' to see -information about them:: +information about all the topics:: $ hg topic --verbose drinks (on branch: default, 2 changesets, 2 behind) * tools (on branch: default, 3 changesets) -The "2 behind" is telling you that there is 2 new changesets on the named +The "2 behind" is telling you that there are 2 new changesets on the named branch of the topic. You need to merge or rebase to incorporate them. -Pushing that topic would create a new heads will be prevented:: +Pushing that topic would create a new head, and therefore will be prevented:: $ hg push --rev drinks pushing to $TESTTMP/server (glob) @@ -439,8 +439,8 @@ Pushing that topic would create a new he [255] -Even after a rebase Pushing all active topics at the same time will -complains about the multiple heads it would create on that branch:: +Even after a rebase, pushing all active topics at the same time will complain +about the multiple heads it would create on that branch:: $ hg rebase -b drinks rebasing 9:8dfa45bd5e0c "Adding apple juice" @@ -457,7 +457,7 @@ complains about the multiple heads it wo [255] Publishing only one of them is allowed (as long as it does not create a new -branch head has we just saw in the previous case):: +branch head as we just saw in the previous case):: $ hg push -r drinks pushing to $TESTTMP/server (glob) @@ -468,8 +468,8 @@ branch head has we just saw in the previ added 2 changesets with 2 changes to 1 files 2 new obsolescence markers -The publishing topic has now vanished, and the one still draft is now marked -as "behind":: +The published topic has now disappeared, and the other is now marked as +"behind":: $ hg topic --verbose * tools (on branch: default, 3 changesets, 2 behind) _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel