hgbook
view it/examples/backout.non-tip.backout.it @ 990:b4ff7b04efdc
French translation : corrected some mistakes in ch05-daily
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Thu Sep 10 14:45:17 2009 +0200 (2009-09-10) |
| parents | 713f0f69029a 5bbebcdfb533 |
| children |
line source
1 <!-- BEGIN backout.non-tip.backout -->
2 <screen><prompt>$</prompt> <userinput>echo terza modifica >> miofile</userinput>
3 <prompt>$</prompt> <userinput>hg commit -m "Terza modifica."</userinput>
4 <prompt>$</prompt> <userinput>hg backout --merge -m "Ritira la seconda modifica." 1</userinput>
5 ripristino miofile
6 creata una nuova testa
7 il changeset 3:af281715005d ritira il changeset 1:51969da8cdc5
8 unisco con il changeset 3:af281715005d
9 unisco miofile
10 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
11 (unione tra rami, ricordatevi di eseguire il commit)
12 </screen>
13 <!-- END backout.non-tip.backout -->