1.1 --- a/en/examples/branch-named	Fri Apr 20 14:35:39 2007 -0700
     1.2 +++ b/en/examples/branch-named	Sun Jun 17 11:42:14 2007 +0200
     1.3 @@ -29,3 +29,46 @@
     1.4  echo 'hello again' >> myfile
     1.5  hg commit -m 'Second commit'
     1.6  hg tip
     1.7 +
     1.8 +#$ name: rebranch
     1.9 +
    1.10 +hg branch
    1.11 +hg branch bar
    1.12 +echo new file > newfile
    1.13 +hg commit -A -m 'Third commit'
    1.14 +hg tip
    1.15 +
    1.16 +#$ name: parents
    1.17 +
    1.18 +hg parents
    1.19 +hg branches
    1.20 +
    1.21 +#$ name: update-switchy
    1.22 +
    1.23 +hg update foo
    1.24 +hg parents
    1.25 +hg update bar
    1.26 +hg parents
    1.27 +
    1.28 +#$ name: update-nothing
    1.29 +
    1.30 +hg update foo
    1.31 +hg update
    1.32 +
    1.33 +#$ name: foo-commit
    1.34 +
    1.35 +echo something > somefile
    1.36 +hg commit -A -m 'New file'
    1.37 +hg heads
    1.38 +
    1.39 +#$ name: update-bar
    1.40 +
    1.41 +hg update bar
    1.42 +hg update -C bar
    1.43 +
    1.44 +#$ name: merge
    1.45 +
    1.46 +hg branch
    1.47 +hg merge
    1.48 +hg commit -m 'Merge'
    1.49 +hg tip