hgbook

annotate en/examples/branch-named @ 564:0d5935744f87

find changesets by author, revision, files, or words in the commit message
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 09 21:39:23 2009 -0700 (2009-03-09)
parents 6519f3b983b4
children
rev   line source
bos@202 1 #!/bin/bash
bos@202 2
bos@202 3 hg init a
bos@202 4 cd a
bos@202 5 echo hello > myfile
bos@202 6 hg commit -A -m 'Initial commit'
bos@202 7
bos@202 8 #$ name: branches
bos@202 9
bos@203 10 hg tip
bos@202 11 hg branches
bos@203 12
bos@203 13 #$ name: branch
bos@203 14
bos@203 15 hg branch
bos@203 16
bos@203 17 #$ name: create
bos@203 18
bos@203 19 hg branch foo
bos@203 20 hg branch
bos@203 21
bos@203 22 #$ name: status
bos@203 23
bos@203 24 hg status
bos@203 25 hg tip
bos@203 26
bos@203 27 #$ name: commit
bos@203 28
bos@203 29 echo 'hello again' >> myfile
bos@203 30 hg commit -m 'Second commit'
bos@203 31 hg tip
bos@206 32
bos@206 33 #$ name: rebranch
bos@206 34
bos@206 35 hg branch
bos@206 36 hg branch bar
bos@206 37 echo new file > newfile
bos@206 38 hg commit -A -m 'Third commit'
bos@206 39 hg tip
bos@206 40
bos@206 41 #$ name: parents
bos@206 42
bos@206 43 hg parents
bos@206 44 hg branches
bos@206 45
bos@206 46 #$ name: update-switchy
bos@206 47
bos@206 48 hg update foo
bos@206 49 hg parents
bos@206 50 hg update bar
bos@206 51 hg parents
bos@206 52
bos@206 53 #$ name: update-nothing
bos@206 54
bos@206 55 hg update foo
bos@206 56 hg update
bos@206 57
bos@206 58 #$ name: foo-commit
bos@206 59
bos@206 60 echo something > somefile
bos@206 61 hg commit -A -m 'New file'
bos@206 62 hg heads
bos@206 63
bos@206 64 #$ name: update-bar
bos@206 65
bos@206 66 hg update bar
bos@206 67
bos@206 68 #$ name: merge
bos@206 69
bos@206 70 hg branch
hg@299 71 hg merge foo
bos@206 72 hg commit -m 'Merge'
bos@206 73 hg tip