hgbook
view it/examples/issue29.go.it @ 790:3d5e63d5d180
Minor changes and translation of code snippets for Ch.5.
| author | Giulio@puck |
|---|---|
| date | Tue Aug 11 21:53:03 2009 +0200 (2009-08-11) |
| parents | |
| children | 0a49072e8c7f |
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/problema29jbjGH5/problema29/b
19 </screen>
20 <!-- END issue29.go -->