Mercurial > hgbook

comparison ja/examples/tour @ 834:896ab6eaf1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 10 Jul 2009 02:32:17 +0900
parents en/examples/tour@477d6a3e5023 en/examples/tour@019040fbf5f5
children
comparison
equal deleted inserted replaced
803:5276f40fca1c 834:896ab6eaf1c6
117 #$ name: older 117 #$ name: older
118 118
119 hg update 2 119 hg update 2
120 hg parents 120 hg parents
121 hg update 121 hg update
122 hg parents
122 123
123 #$ name: clone-push 124 #$ name: clone-push
124 125
125 cd .. 126 cd ..
126 hg clone hello hello-push 127 hg clone hello hello-push
146 147
147 hg push http://hg.serpentine.com/tutorial/hello 148 hg push http://hg.serpentine.com/tutorial/hello
148 149
149 #$ name: 150 #$ name:
150 cp hello.c ../new-hello.c 151 cp hello.c ../new-hello.c
151 sed -i '/printf/i\\tprintf("once more, hello.\\n");' ../new-hello.c 152 sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c
153
154 my-text-editor()
155 {
156 cp ../new-hello.c hello.c
157 }
152 158
153 #$ name: merge.clone 159 #$ name: merge.clone
154 160
155 cd .. 161 cd ..
156 hg clone hello my-new-hello 162 hg clone hello my-new-hello
157 cd my-new-hello 163 cd my-new-hello
158 # The file new-hello.c is lightly edited. 164 # Make some simple edits to hello.c.
159 cp ../new-hello.c hello.c 165 my-text-editor hello.c
160 hg commit -m 'A new hello for a new day.' 166 hg commit -m 'A new hello for a new day.'
161 167
162 #$ name: merge.dummy2 168 #$ name: merge.dummy2
163 169
164 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello 170 hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello
165 171
166 #$ name: merge.cat 172 #$ name: merge.cat1
167 173
168 cat hello.c 174 cat hello.c
175
176 #$ name: merge.cat2
177
169 cat ../my-hello/hello.c 178 cat ../my-hello/hello.c
170 179
171 #$ name: merge.pull 180 #$ name: merge.pull
172 181
173 hg pull ../my-hello 182 hg pull ../my-hello