--- a/tests/test-topic-tutorial.t Sun Jul 09 14:20:24 2017 +0300
+++ b/tests/test-topic-tutorial.t Sun Jul 09 14:23:27 2017 +0300
@@ -57,7 +57,8 @@
$ hg topic food
-As for named branch, our topic is active but it does not contains any changesets yet::
+As for named branch, our topic is active but it does not contains any
+changesets yet::
$ hg topic
* food
@@ -117,7 +118,8 @@
summary: adding condiments
-We can get a compact view of the content of our topic using the ``stack`` command::
+We can get a compact view of the content of our topic using the ``stack``
+command::
$ hg stack
### topic: food
@@ -133,7 +135,8 @@
$ hg topic
food
-Note that ``default`` (name of the branch) now refers to the tipmost changeset of default without a topic::
+Note that ``default`` (name of the branch) now refers to the tipmost
+changeset of default without a topic::
$ hg log --graph
o changeset: 2:287de11b401f
@@ -163,7 +166,8 @@
$ 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::
+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::
$ hg up default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -190,7 +194,8 @@
$ 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::
+Topic will also affect rebase and merge destination. Let's pull the latest
+update from the main server::
$ hg pull
pulling from $TESTTMP/server (glob)
@@ -226,7 +231,8 @@
summary: Shopping list
-The topic head will not be considered when merge from the new head of the branch::
+The topic head will not be considered when merge from the new head of the
+branch::
$ hg up default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -367,7 +373,8 @@
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 independant branch by Mercurial. No rebase or merge betwen
+them will be attempted by default::
$ hg rebase
nothing to rebase
@@ -400,7 +407,8 @@
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 changeset on top of the latest::
+There is new changes! We can simply use ``hg rebase`` to update our
+changeset on top of the latest::
$ hg rebase
rebasing 6:183984ef46d1 "Adding hammer"
@@ -411,13 +419,15 @@
rebasing 8:34255b455dac "Adding drill"
merging shopping
-But what about the other topic? You can use 'hg topic --verbose' to see information about them::
+But what about the other topic? You can use 'hg topic --verbose' to see
+information about them::
$ 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 branch of the topic. You need to merge or rebase to incorporate them.
+The "2 behind" is telling you that there is 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::
@@ -429,7 +439,8 @@
[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
+complains about the multiple heads it would create on that branch::
$ hg rebase -b drinks
rebasing 9:8dfa45bd5e0c "Adding apple juice"
@@ -445,7 +456,8 @@
(merge or see 'hg help push' for details about pushing new heads)
[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)::
+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)::
$ hg push -r drinks
pushing to $TESTTMP/server (glob)
@@ -456,7 +468,8 @@
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 publishing topic has now vanished, and the one still draft is now marked
+as "behind"::
$ hg topic --verbose
* tools (on branch: default, 3 changesets, 2 behind)