hgbook
annotate it/examples/issue29.go.it @ 1024:ea04ebd452b5
French : second part of ch06
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Thu Dec 03 22:45:38 2009 +0100 (2009-12-03) |
| parents | 713f0f69029a 0a49072e8c7f |
| children |
| rev | line source |
|---|---|
| Giulio@790 | 1 <!-- BEGIN issue29.go --> |
| Giulio@790 | 2 <screen><prompt>$</prompt> <userinput>hg init problema29</userinput> |
| Giulio@790 | 3 <prompt>$</prompt> <userinput>cd problema29</userinput> |
| Giulio@790 | 4 <prompt>$</prompt> <userinput>echo a > a</userinput> |
| Giulio@790 | 5 <prompt>$</prompt> <userinput>hg ci -Ama</userinput> |
| Giulio@790 | 6 aggiungo a |
| Giulio@790 | 7 <prompt>$</prompt> <userinput>echo b > b</userinput> |
| Giulio@790 | 8 <prompt>$</prompt> <userinput>hg ci -Amb</userinput> |
| Giulio@790 | 9 aggiungo b |
| Giulio@790 | 10 <prompt>$</prompt> <userinput>hg up 0</userinput> |
| Giulio@790 | 11 0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti |
| Giulio@790 | 12 <prompt>$</prompt> <userinput>mkdir b</userinput> |
| Giulio@790 | 13 <prompt>$</prompt> <userinput>echo b > b/b</userinput> |
| Giulio@790 | 14 <prompt>$</prompt> <userinput>hg ci -Amc</userinput> |
| Giulio@790 | 15 aggiungo b/b |
| Giulio@790 | 16 creata una nuova testa |
| Giulio@790 | 17 <prompt>$</prompt> <userinput>hg merge</userinput> |
| gpiancastelli@839 | 18 fallimento: รจ una directory: /tmp/problema29/b |
| Giulio@790 | 19 </screen> |
| Giulio@790 | 20 <!-- END issue29.go --> |