hgbook

diff it/examples/backout.non-tip.backout.it @ 976:713f0f69029a

find changesets by author, revision, files, or words in the commit message
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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/backout.non-tip.backout.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,13 @@
     1.4 +<!-- BEGIN backout.non-tip.backout -->
     1.5 +<screen><prompt>$</prompt> <userinput>echo terza modifica &gt;&gt; miofile</userinput>
     1.6 +<prompt>$</prompt> <userinput>hg commit -m "Terza modifica."</userinput>
     1.7 +<prompt>$</prompt> <userinput>hg backout --merge -m "Ritira la seconda modifica." 1</userinput>
     1.8 +ripristino miofile
     1.9 +creata una nuova testa
    1.10 +il changeset 3:af281715005d ritira il changeset 1:51969da8cdc5
    1.11 +unisco con il changeset 3:af281715005d
    1.12 +unisco miofile
    1.13 +0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
    1.14 +(unione tra rami, ricordatevi di eseguire il commit)
    1.15 +</screen>
    1.16 +<!-- END backout.non-tip.backout -->