hgbook

view es/examples/branch-named @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents
children
line source
1 #!/bin/bash
2
3 hg init a
4 cd a
5 echo hello > myfile
6 hg commit -A -m 'Initial commit'
7
8 #$ name: branches
9
10 hg tip
11 hg branches
12
13 #$ name: branch
14
15 hg branch
16
17 #$ name: create
18
19 hg branch foo
20 hg branch
21
22 #$ name: status
23
24 hg status
25 hg tip
26
27 #$ name: commit
28
29 echo 'hello again' >> myfile
30 hg commit -m 'Second commit'
31 hg tip
32
33 #$ name: rebranch
34
35 hg branch
36 hg branch bar
37 echo new file > newfile
38 hg commit -A -m 'Third commit'
39 hg tip
40
41 #$ name: parents
42
43 hg parents
44 hg branches
45
46 #$ name: update-switchy
47
48 hg update foo
49 hg parents
50 hg update bar
51 hg parents
52
53 #$ name: update-nothing
54
55 hg update foo
56 hg update
57
58 #$ name: foo-commit
59
60 echo something > somefile
61 hg commit -A -m 'New file'
62 hg heads
63
64 #$ name: update-bar
65
66 hg update bar
67
68 #$ name: merge
69
70 hg branch
71 hg merge foo
72 hg commit -m 'Merge'
73 hg tip