hgbook
view it/examples/issue29.go.it @ 1055:4f899bb4d0dd
1.6.5 refined
| author | zhaopingsun |
|---|---|
| date | Tue Nov 10 19:48:42 2009 -0500 (2009-11-10) |
| parents | 3d5e63d5d180 |
| children | 719b03ea27c8 |
line source
1 <!-- BEGIN issue29.go -->
2 <screen><prompt>$</prompt> <userinput>hg init problema29</userinput>
3 <prompt>$</prompt> <userinput>cd problema29</userinput>
4 <prompt>$</prompt> <userinput>echo a > a</userinput>
5 <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
6 aggiungo a
7 <prompt>$</prompt> <userinput>echo b > b</userinput>
8 <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
9 aggiungo b
10 <prompt>$</prompt> <userinput>hg up 0</userinput>
11 0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti
12 <prompt>$</prompt> <userinput>mkdir b</userinput>
13 <prompt>$</prompt> <userinput>echo b > b/b</userinput>
14 <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
15 aggiungo b/b
16 creata una nuova testa
17 <prompt>$</prompt> <userinput>hg merge</userinput>
18 fallimento: รจ una directory: /tmp/problema29/b
19 </screen>
20 <!-- END issue29.go -->