hgbook
diff fr/examples/tour @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
parents | en/examples/tour@477d6a3e5023 en/examples/tour@547d3aa25ef0 |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/fr/examples/tour Sun Aug 16 03:41:39 2009 +0200 1.3 @@ -0,0 +1,215 @@ 1.4 +#!/bin/bash 1.5 + 1.6 +#$ name: version 1.7 + 1.8 +hg version 1.9 + 1.10 +#$ name: help 1.11 + 1.12 +hg help init 1.13 + 1.14 +#$ name: clone 1.15 + 1.16 +hg clone http://hg.serpentine.com/tutorial/hello 1.17 + 1.18 +#$ name: ls 1.19 +#$ ignore: ^drwx.* 1.20 +#$ ignore: ^total \d+ 1.21 + 1.22 +ls -l 1.23 +ls hello 1.24 + 1.25 +#$ name: ls-a 1.26 + 1.27 +cd hello 1.28 +ls -a 1.29 + 1.30 +#$ name: log 1.31 + 1.32 +hg log 1.33 + 1.34 +#$ name: log-r 1.35 + 1.36 +hg log -r 3 1.37 +hg log -r 0272e0d5a517 1.38 +hg log -r 1 -r 4 1.39 + 1.40 +#$ name: log.range 1.41 + 1.42 +hg log -r 2:4 1.43 + 1.44 +#$ name: log-v 1.45 + 1.46 +hg log -v -r 3 1.47 + 1.48 +#$ name: log-vp 1.49 + 1.50 +hg log -v -p -r 2 1.51 + 1.52 +#$ name: reclone 1.53 + 1.54 +cd .. 1.55 +hg clone hello my-hello 1.56 +cd my-hello 1.57 + 1.58 +#$ name: cat1 1.59 +cat hello.c 1.60 + 1.61 +#$ name: 1.62 + 1.63 +sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c 1.64 + 1.65 +#$ name: cat2 1.66 +# ... edit edit edit ... 1.67 +cat hello.c 1.68 + 1.69 +#$ name: status 1.70 + 1.71 +ls 1.72 +hg status 1.73 + 1.74 +#$ name: diff 1.75 + 1.76 +hg diff 1.77 + 1.78 +#$ name: 1.79 + 1.80 +export HGEDITOR='echo Added an extra line of output >' 1.81 + 1.82 +#$ name: commit 1.83 + 1.84 +hg commit 1.85 + 1.86 +#$ name: merge.dummy1 1.87 + 1.88 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello 1.89 + 1.90 +#$ name: tip 1.91 + 1.92 +hg tip -vp 1.93 + 1.94 +#$ name: clone-pull 1.95 + 1.96 +cd .. 1.97 +hg clone hello hello-pull 1.98 + 1.99 +#$ name: incoming 1.100 + 1.101 +cd hello-pull 1.102 +hg incoming ../my-hello 1.103 + 1.104 +#$ name: pull 1.105 + 1.106 +hg tip 1.107 +hg pull ../my-hello 1.108 +hg tip 1.109 + 1.110 +#$ name: update 1.111 + 1.112 +grep printf hello.c 1.113 +hg update tip 1.114 +grep printf hello.c 1.115 + 1.116 +#$ name: parents 1.117 + 1.118 +hg parents 1.119 + 1.120 +#$ name: older 1.121 + 1.122 +hg update 2 1.123 +hg parents 1.124 +hg update 1.125 +hg parents 1.126 + 1.127 +#$ name: clone-push 1.128 + 1.129 +cd .. 1.130 +hg clone hello hello-push 1.131 + 1.132 +#$ name: outgoing 1.133 + 1.134 +cd my-hello 1.135 +hg outgoing ../hello-push 1.136 + 1.137 +#$ name: push 1.138 + 1.139 +hg push ../hello-push 1.140 + 1.141 +#$ name: push.nothing 1.142 + 1.143 +hg push ../hello-push 1.144 + 1.145 +#$ name: outgoing.net 1.146 + 1.147 +hg outgoing http://hg.serpentine.com/tutorial/hello 1.148 + 1.149 +#$ name: push.net 1.150 + 1.151 +hg push http://hg.serpentine.com/tutorial/hello 1.152 + 1.153 +#$ name: 1.154 +cp hello.c ../new-hello.c 1.155 +sed -i '/printf("hello,/i\\tprintf("once more, hello.\\n");' ../new-hello.c 1.156 + 1.157 +my-text-editor() 1.158 +{ 1.159 +cp ../new-hello.c hello.c 1.160 +} 1.161 + 1.162 +#$ name: merge.clone 1.163 + 1.164 +cd .. 1.165 +hg clone hello my-new-hello 1.166 +cd my-new-hello 1.167 +# Make some simple edits to hello.c. 1.168 +my-text-editor hello.c 1.169 +hg commit -m 'A new hello for a new day.' 1.170 + 1.171 +#$ name: merge.dummy2 1.172 + 1.173 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello 1.174 + 1.175 +#$ name: merge.cat1 1.176 + 1.177 +cat hello.c 1.178 + 1.179 +#$ name: merge.cat2 1.180 + 1.181 +cat ../my-hello/hello.c 1.182 + 1.183 +#$ name: merge.pull 1.184 + 1.185 +hg pull ../my-hello 1.186 + 1.187 +#$ name: merge.dummy3 1.188 + 1.189 +hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello 1.190 + 1.191 +#$ name: merge.heads 1.192 + 1.193 +hg heads 1.194 + 1.195 +#$ name: merge.update 1.196 + 1.197 +hg update 1.198 + 1.199 +#$ name: merge.merge 1.200 + 1.201 +hg merge 1.202 + 1.203 +#$ name: merge.parents 1.204 + 1.205 +hg parents 1.206 +cat hello.c 1.207 + 1.208 +#$ name: merge.commit 1.209 + 1.210 +hg commit -m 'Merged changes' 1.211 + 1.212 +#$ name: merge.dummy4 1.213 + 1.214 +hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello 1.215 + 1.216 +#$ name: merge.tip 1.217 + 1.218 +hg tip