annotate en/examples/tour @ 406:fb5c0d56d7f1

Fix test 'tour'. Executing 'tour' test now creates some files in /tmp to store the revision numbers as they are created on the fly and appear in the output files. When SVG files are to be converted to PNG or EPS files within the Makefile, a tool 'fixsvg' will be invoked to substitute some placeholder markup by the real version number which fits to the test output, before the final conversion takes place.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 22:15:35 +0200
parents ef6a1427d0af
children c44d5854620b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
87
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 #!/bin/bash
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 #$ name: version
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 hg version
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 #$ name: help
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 hg help init
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 #$ name: clone
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 hg clone http://hg.serpentine.com/tutorial/hello
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 #$ name: ls
139
ceaca14e49f0 Add local regexps to ignore bits of output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 102
diff changeset
16 #$ ignore: ^drwx.*
174
ef6a1427d0af Update tour info more usefully.
Bryan O'Sullivan <bos@serpentine.com>
parents: 139
diff changeset
17 #$ ignore: ^total \d+
87
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19 ls -l
0995016342f8 More bumf.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20 ls hello
88
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
21
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
22 #$ name: ls-a
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
23
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
24 cd hello
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
25 ls -a
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
26
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
27 #$ name: log
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
28
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
29 hg log
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
30
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
31 #$ name: log-r
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
32
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
33 hg log -r 3
406
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
34 hg log -r 0272e0d5a517
88
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
35 hg log -r 1 -r 4
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
36
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
37 #$ name: log.range
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
38
d351032c189c Progress with log coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 87
diff changeset
39 hg log -r 2:4
91
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
40
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
41 #$ name: log-v
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
42
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
43 hg log -v -r 3
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
44
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
45 #$ name: log-vp
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
46
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
47 hg log -v -p -r 2
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
48
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
49 #$ name: reclone
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
50
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
51 cd ..
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
52 hg clone hello my-hello
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
53 cd my-hello
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
54
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
55 #$ name: sed
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
56
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
57 sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
58
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
59 #$ name: status
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
60
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
61 ls
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
62 hg status
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
63
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
64 #$ name: diff
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
65
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
66 hg diff
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
67
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
68 #$ name:
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
69
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
70 export HGEDITOR='echo Added an extra line of output >'
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
71
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
72 #$ name: commit
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
73
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
74 hg commit
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
75
406
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
76 #$ name: merge.dummy1
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
77
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
78 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
79
91
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
80 #$ name: tip
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
81
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
82 hg tip -vp
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
83
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
84 #$ name: clone-pull
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
85
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
86 cd ..
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
87 hg clone hello hello-pull
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
88
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
89 #$ name: incoming
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
90
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
91 cd hello-pull
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
92 hg incoming ../my-hello
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
93
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
94 #$ name: pull
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
95
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
96 hg tip
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
97 hg pull ../my-hello
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
98 hg tip
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
99
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
100 #$ name: update
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
101
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
102 grep printf hello.c
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
103 hg update tip
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
104 grep printf hello.c
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
105
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
106 #$ name: parents
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
107
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
108 hg parents
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
109
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
110 #$ name: older
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
111
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
112 hg update 2
7524d52d9577 More tour progress.
Bryan O'Sullivan <bos@serpentine.com>
parents: 88
diff changeset
113 hg parents
94
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
114 hg update
92
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
115
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
116 #$ name: clone-push
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
117
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
118 cd ..
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
119 hg clone hello hello-push
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
120
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
121 #$ name: outgoing
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
122
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
123 cd my-hello
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
124 hg outgoing ../hello-push
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
125
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
126 #$ name: push
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
127
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
128 hg push ../hello-push
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
129
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
130 #$ name: push.nothing
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
131
72d207927dc4 Tour: push.
Bryan O'Sullivan <bos@serpentine.com>
parents: 91
diff changeset
132 hg push ../hello-push
93
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
133
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
134 #$ name: outgoing.net
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
135
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
136 hg outgoing http://hg.serpentine.com/tutorial/hello
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
137
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
138 #$ name: push.net
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
139
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
140 hg push http://hg.serpentine.com/tutorial/hello
97638d862ef3 Network bits.
Bryan O'Sullivan <bos@serpentine.com>
parents: 92
diff changeset
141
94
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
142 #$ name: merge.clone
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
143
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
144 cd ..
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
145 hg clone hello my-new-hello
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
146 cd my-new-hello
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
147 sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
148 hg commit -m 'A new hello for a new day.'
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
149
406
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
150 #$ name: merge.dummy2
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
151
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
152 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
153
94
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
154 #$ name: merge.cat
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
155
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
156 cat hello.c
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
157 cat ../my-hello/hello.c
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
158
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
159 #$ name: merge.pull
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
160
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
161 hg pull ../my-hello
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
162
406
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
163 #$ name: merge.dummy3
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
164
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
165 hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
166
94
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
167 #$ name: merge.heads
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
168
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
169 hg heads
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
170
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
171 #$ name: merge.update
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
172
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
173 hg update
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
174
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
175 #$ name: merge.merge
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
176
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
177 hg merge
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
178
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
179 #$ name: merge.parents
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
180
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
181 hg parents
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
182 cat hello.c
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
183
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
184 #$ name: merge.commit
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
185
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
186 hg commit -m 'Merged changes'
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
187
406
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
188 #$ name: merge.dummy4
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
189
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
190 hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello
fb5c0d56d7f1 Fix test 'tour'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 174
diff changeset
191
94
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
192 #$ name: merge.tip
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
193
0b97b0bdc830 Basic merge coverage.
Bryan O'Sullivan <bos@serpentine.com>
parents: 93
diff changeset
194 hg tip