evolve: comparison tests/test-topic-tutorial.t

equal deleted inserted replaced

-:93588d219f2f
+:498409c72dd2
 Much like a named branch, our topic is active but it does not contain any
 changesets yet:
 $ hg topic
 * food
 $ hg summary
 parent: 0:38da43f0a2ea tip
 Shopping list
 branch: default
 commit: (clean)
 update: (current)
 topic:  food
 $ hg log --graph
 @  changeset:   0:38da43f0a2ea
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 > Egg
 > Suggar
 > Vinegar
 > Oil
 > EOF
 $ hg commit -m "adding condiments"
 $ hg log --graph --rev 'topic("food")'
 @  changeset:   1:13900241408b
 |  tag:         tip
 ~  topic:       food
 user:        test
 $ cat >> shopping << EOF
 > Bananas
 > Pear
 > Apple
 > EOF
 $ hg commit -m "adding fruits"
 $ hg log --graph --rev 'topic("food")'
 @  changeset:   2:287de11b401f
 |  tag:         tip
 |  topic:       food
 |  user:        test
 t1: adding condiments
 t0^ Shopping list (base)
 The topic deactivates when we update away from it:
-$ hg up default
+$ hg update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topic
 food
 Note that ``default`` (name of the branch) now refers to the tipmost
 changeset of default without a topic:
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Shopping list
 And updating back to the topic reactivates it:
-$ hg up food
+$ hg update food
 switching to topic food
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topic
 * food
 Updating to any changeset that is part of a topic activates the topic
 regardless of how the revision was specified:
-$ hg up default
+$ hg update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ hg up --rev 'desc("condiments")'
+$ hg update --rev 'desc("condiments")'
 switching to topic food
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topic
 * food
-.. server side activity:
+.. Server side activity:
 $ cd ../server/
 $ cat > shopping << EOF
 > T-Shirt
 > Trousers
 > Rat (rather a lot)
 > Jugged fish
 > Blancmange
 > Salmon mousse
 > EOF
 $ hg commit -A -m "Adding clothes"
 $ cd ../client
 The topic will also affect the rebase and the merge destinations. Let's pull
 the latest update from the main server:
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads)
 $ hg log -G
 o  changeset:   3:6104862e8b84
 |  tag:         tip
 |  parent:      0:38da43f0a2ea
 |  user:        test
 The topic head will not be considered when merging from the new head of the
 branch:
-$ hg up default
+$ hg update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg merge
 abort: branch 'default' has one head - please merge with an explicit rev
 (run 'hg heads' to see all heads)
 [255]
 But the topic will see that branch head as a valid destination:
-$ hg up food
+$ hg update food
 switching to topic food
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg rebase
 rebasing 1:13900241408b "adding condiments"
 merging shopping
 switching to topic food
 rebasing 2:287de11b401f "adding fruits"
 merging shopping
 $ hg log --graph
 @  changeset:   5:2d50db8b5b4c
 |  tag:         tip
 |  topic:       food
 |  user:        test
 The topic information will disappear when we publish the changesets:
 $ hg topic
 * food
 $ hg push
 pushing to $TESTTMP/server (glob)
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 2 new obsolescence markers
 $ hg topic
 * food
 $ hg log --graph
 @  changeset:   5:2d50db8b5b4c
 |  tag:         tip
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 o  changeset:   0:38da43f0a2ea
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Shopping list
-$ hg up default
+$ hg update default
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Working with Multiple Topics
 ============================
 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
 $ echo hammer >> shopping
-$ hg ci -m 'Adding hammer'
+$ hg commit -m 'Adding hammer'
 $ echo saw >> shopping
-$ hg ci -m 'Adding saw'
+$ hg commit -m 'Adding saw'
 $ echo drill >> shopping
-$ hg ci -m 'Adding drill'
+$ hg commit -m 'Adding drill'
 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
+$ hg update default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topic drinks
 $ echo 'apple juice' >> shopping
-$ hg ci -m 'Adding apple juice'
+$ hg commit -m 'Adding apple juice'
 $ echo 'orange juice' >> shopping
-$ hg ci -m 'Adding orange juice'
+$ hg commit -m 'Adding orange juice'
 We now have two topics:
 $ hg topic
 * drinks
 ### topic: drinks
 ### branch: default
 t2@ Adding orange juice (current)
 t1: Adding apple juice
 t0^ adding fruits (base)
-$ hg up tools
+$ hg update tools
 switching to topic tools
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg stack
 ### topic: tools
 ### branch: default
 t3@ Adding drill (current)
 t2: Adding saw
 $ hg rebase
 nothing to rebase
 [1]
-.. server activity:
+Server activity:
 $ cd ../server
-$ hg up
+$ hg update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mv shopping foo
 $ echo 'Coat' > shopping
 $ cat foo >> shopping
-$ hg ci -m 'add a coat'
+$ hg commit -m 'add a coat'
 $ echo 'Coat' > shopping
 $ echo 'Shoes' >> shopping
 $ cat foo >> shopping
 $ rm foo
-$ hg ci -m 'add a pair of shoes'
+$ hg commit -m 'add a pair of shoes'
 $ cd ../client
 Let's see what other people did in the meantime:
 $ hg pull
 (run 'hg heads' to see heads)
 There are new changes! We can simply use ``hg rebase`` to update our
 changeset on top of the latest:
+$ hg log -G
+o  changeset:   12:fbff9bc37a43
+|  tag:         tip
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     add a pair of shoes
+|
+o  changeset:   11:f2d6cacc6115
+|  parent:      5:2d50db8b5b4c
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     add a coat
+|
+| o  changeset:   10:70dfa201ed73
+| |  topic:       drinks
+| |  user:        test
+| |  date:        Thu Jan 01 00:00:00 1970 +0000
+| |  summary:     Adding orange juice
+| |
+| o  changeset:   9:8dfa45bd5e0c
+|/   topic:       drinks
+|    parent:      5:2d50db8b5b4c
+|    user:        test
+|    date:        Thu Jan 01 00:00:00 1970 +0000
+|    summary:     Adding apple juice
+|
+| @  changeset:   8:34255b455dac
+| |  topic:       tools
+| |  user:        test
+| |  date:        Thu Jan 01 00:00:00 1970 +0000
+| |  summary:     Adding drill
+| |
+| o  changeset:   7:cffff85af537
+| |  topic:       tools
+| |  user:        test
+| |  date:        Thu Jan 01 00:00:00 1970 +0000
+| |  summary:     Adding saw
+| |
+| o  changeset:   6:183984ef46d1
+|/   topic:       tools
+|    user:        test
+|    date:        Thu Jan 01 00:00:00 1970 +0000
+|    summary:     Adding hammer
+|
+o  changeset:   5:2d50db8b5b4c
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     adding fruits
+|
+o  changeset:   4:4011b46eeb33
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     adding condiments
+|
+o  changeset:   3:6104862e8b84
+|  parent:      0:38da43f0a2ea
+|  user:        test
+|  date:        Thu Jan 01 00:00:00 1970 +0000
+|  summary:     Adding clothes
+|
+o  changeset:   0:38da43f0a2ea
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Shopping list
 $ hg rebase
 rebasing 6:183984ef46d1 "Adding hammer"
 merging shopping
 switching to topic tools
 rebasing 7:cffff85af537 "Adding saw"
 merging shopping
 switching to topic drinks
 rebasing 10:70dfa201ed73 "Adding orange juice"
 merging shopping
 switching to topic tools
 $ hg push
 pushing to $TESTTMP/server (glob)
 searching for changes
 abort: push creates new remote head 4cd7c1591a67!
 (merge or see 'hg help push' for details about pushing new heads)
 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)
 $ hg stack
 ### topic: tools
 ### branch: default, 2 behind
 t3@ Adding drill (current)
 t2: Adding saw

branch	stable
changeset 2827	498409c72dd2
parent 2826	93588d219f2f
child 2829	1c529afd3fef