diff en/examples/branch-named @ 206:6519f3b983b4

More material about named branches.

--- a/en/examples/branch-named	Mon Apr 23 13:52:15 2007 -0700
+++ b/en/examples/branch-named	Mon Apr 23 15:28:13 2007 -0700
@@ -29,3 +29,46 @@
 echo 'hello again' >> myfile
 hg commit -m 'Second commit'
 hg tip
+
+#$ name: rebranch
+
+hg branch
+hg branch bar
+echo new file > newfile
+hg commit -A -m 'Third commit'
+hg tip
+
+#$ name: parents
+
+hg parents
+hg branches
+
+#$ name: update-switchy
+
+hg update foo
+hg parents
+hg update bar
+hg parents
+
+#$ name: update-nothing
+
+hg update foo
+hg update
+
+#$ name: foo-commit
+
+echo something > somefile
+hg commit -A -m 'New file'
+hg heads
+
+#$ name: update-bar
+
+hg update bar
+hg update -C bar
+
+#$ name: merge
+
+hg branch
+hg merge
+hg commit -m 'Merge'
+hg tip