hgbook

view en/examples/tour @ 619:4e23c220d1b0

find changesets by author, revision, files, or words in the commit message
Update chapter 2
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 06 22:05:44 2009 -0700 (2009-04-06)
parents c44d5854620b
children c8d662d3cb40
line source
1 #!/bin/bash
2
3 #$ name: version
4
5 hg version
6
7 #$ name: help
8
9 hg help init
10
11 #$ name: clone
12
13 hg clone http://hg.serpentine.com/tutorial/hello
14
15 #$ name: ls
16 #$ ignore: ^drwx.*
17 #$ ignore: ^total \d+
18
19 ls -l
20 ls hello
21
22 #$ name: ls-a
23
24 cd hello
25 ls -a
26
27 #$ name: log
28
29 hg log
30
31 #$ name: log-r
32
33 hg log -r 3
34 hg log -r 0272e0d5a517
35 hg log -r 1 -r 4
36
37 #$ name: log.range
38
39 hg log -r 2:4
40
41 #$ name: log-v
42
43 hg log -v -r 3
44
45 #$ name: log-vp
46
47 hg log -v -p -r 2
48
49 #$ name: reclone
50
51 cd ..
52 hg clone hello my-hello
53 cd my-hello
54
55 #$ name: cat1
56 cat hello.c
57
58 #$ name:
59
60 sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c
61
62 #$ name: cat2
63 # ... edit edit edit ...
64 cat hello.c
65
66 #$ name: status
67
68 ls
69 hg status
70
71 #$ name: diff
72
73 hg diff
74
75 #$ name:
76
77 export HGEDITOR='echo Added an extra line of output >'
78
79 #$ name: commit
80
81 hg commit
82
83 #$ name: merge.dummy1
84
85 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello
86
87 #$ name: tip
88
89 hg tip -vp
90
91 #$ name: clone-pull
92
93 cd ..
94 hg clone hello hello-pull
95
96 #$ name: incoming
97
98 cd hello-pull
99 hg incoming ../my-hello
100
101 #$ name: pull
102
103 hg tip
104 hg pull ../my-hello
105 hg tip
106
107 #$ name: update
108
109 grep printf hello.c
110 hg update tip
111 grep printf hello.c
112
113 #$ name: parents
114
115 hg parents
116
117 #$ name: older
118
119 hg update 2
120 hg parents
121 hg update
122
123 #$ name: clone-push
124
125 cd ..
126 hg clone hello hello-push
127
128 #$ name: outgoing
129
130 cd my-hello
131 hg outgoing ../hello-push
132
133 #$ name: push
134
135 hg push ../hello-push
136
137 #$ name: push.nothing
138
139 hg push ../hello-push
140
141 #$ name: outgoing.net
142
143 hg outgoing http://hg.serpentine.com/tutorial/hello
144
145 #$ name: push.net
146
147 hg push http://hg.serpentine.com/tutorial/hello
148
149 #$ name:
150 cp hello.c ../new-hello.c
151 sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c
152
153 #$ name: merge.clone
154
155 cd ..
156 hg clone hello my-new-hello
157 cd my-new-hello
158 # The file new-hello.c is lightly edited.
159 cp ../new-hello.c hello.c
160 hg commit -m 'A new hello for a new day.'
161
162 #$ name: merge.dummy2
163
164 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
165
166 #$ name: merge.cat
167
168 cat hello.c
169 cat ../my-hello/hello.c
170
171 #$ name: merge.pull
172
173 hg pull ../my-hello
174
175 #$ name: merge.dummy3
176
177 hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello
178
179 #$ name: merge.heads
180
181 hg heads
182
183 #$ name: merge.update
184
185 hg update
186
187 #$ name: merge.merge
188
189 hg merge
190
191 #$ name: merge.parents
192
193 hg parents
194 cat hello.c
195
196 #$ name: merge.commit
197
198 hg commit -m 'Merged changes'
199
200 #$ name: merge.dummy4
201
202 hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello
203
204 #$ name: merge.tip
205
206 hg tip