annotate it/examples/backout.non-tip.backout.it @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
| parents |
|
| children |
719b03ea27c8 |
| rev |
line source |
|
belaran@976
|
1 <!-- BEGIN backout.non-tip.backout -->
|
|
belaran@976
|
2 <screen><prompt>$</prompt> <userinput>echo terza modifica >> miofile</userinput>
|
|
belaran@976
|
3 <prompt>$</prompt> <userinput>hg commit -m "Terza modifica."</userinput>
|
|
belaran@976
|
4 <prompt>$</prompt> <userinput>hg backout --merge -m "Ritira la seconda modifica." 1</userinput>
|
|
belaran@976
|
5 ripristino miofile
|
|
belaran@976
|
6 creata una nuova testa
|
|
belaran@976
|
7 il changeset 3:af281715005d ritira il changeset 1:51969da8cdc5
|
|
belaran@976
|
8 unisco con il changeset 3:af281715005d
|
|
belaran@976
|
9 unisco miofile
|
|
belaran@976
|
10 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
|
|
belaran@976
|
11 (unione tra rami, ricordatevi di eseguire il commit)
|
|
belaran@976
|
12 </screen>
|
|
belaran@976
|
13 <!-- END backout.non-tip.backout -->
|
