hgbook

view en/examples/tour @ 609:c44d5854620b

Fix up chapter 1.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 22:38:30 2009 -0700 (2009-03-31)
parents fb5c0d56d7f1
children 4e23c220d1b0
line source
1 #!/bin/bash
3 #$ name: version
5 hg version
7 #$ name: help
9 hg help init
11 #$ name: clone
13 hg clone http://hg.serpentine.com/tutorial/hello
15 #$ name: ls
16 #$ ignore: ^drwx.*
17 #$ ignore: ^total \d+
19 ls -l
20 ls hello
22 #$ name: ls-a
24 cd hello
25 ls -a
27 #$ name: log
29 hg log
31 #$ name: log-r
33 hg log -r 3
34 hg log -r 0272e0d5a517
35 hg log -r 1 -r 4
37 #$ name: log.range
39 hg log -r 2:4
41 #$ name: log-v
43 hg log -v -r 3
45 #$ name: log-vp
47 hg log -v -p -r 2
49 #$ name: reclone
51 cd ..
52 hg clone hello my-hello
53 cd my-hello
55 #$ name: cat1
56 cat hello.c
58 #$ name:
60 sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c
62 #$ name: cat2
63 # ... edit edit edit ...
64 cat hello.c
66 #$ name: status
68 ls
69 hg status
71 #$ name: diff
73 hg diff
75 #$ name:
77 export HGEDITOR='echo Added an extra line of output >'
79 #$ name: commit
81 hg commit
83 #$ name: merge.dummy1
85 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello
87 #$ name: tip
89 hg tip -vp
91 #$ name: clone-pull
93 cd ..
94 hg clone hello hello-pull
96 #$ name: incoming
98 cd hello-pull
99 hg incoming ../my-hello
101 #$ name: pull
103 hg tip
104 hg pull ../my-hello
105 hg tip
107 #$ name: update
109 grep printf hello.c
110 hg update tip
111 grep printf hello.c
113 #$ name: parents
115 hg parents
117 #$ name: older
119 hg update 2
120 hg parents
121 hg update
123 #$ name: clone-push
125 cd ..
126 hg clone hello hello-push
128 #$ name: outgoing
130 cd my-hello
131 hg outgoing ../hello-push
133 #$ name: push
135 hg push ../hello-push
137 #$ name: push.nothing
139 hg push ../hello-push
141 #$ name: outgoing.net
143 hg outgoing http://hg.serpentine.com/tutorial/hello
145 #$ name: push.net
147 hg push http://hg.serpentine.com/tutorial/hello
149 #$ name: merge.clone
151 cd ..
152 hg clone hello my-new-hello
153 cd my-new-hello
154 sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
155 hg commit -m 'A new hello for a new day.'
157 #$ name: merge.dummy2
159 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
161 #$ name: merge.cat
163 cat hello.c
164 cat ../my-hello/hello.c
166 #$ name: merge.pull
168 hg pull ../my-hello
170 #$ name: merge.dummy3
172 hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello
174 #$ name: merge.heads
176 hg heads
178 #$ name: merge.update
180 hg update
182 #$ name: merge.merge
184 hg merge
186 #$ name: merge.parents
188 hg parents
189 cat hello.c
191 #$ name: merge.commit
193 hg commit -m 'Merged changes'
195 #$ name: merge.dummy4
197 hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello
199 #$ name: merge.tip
201 hg tip