hgbook
annotate it/examples/backout.non-tip.backout.it @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
| parents | 713f0f69029a 5bbebcdfb533 |
| children |
| rev | line source |
|---|---|
| Giulio@793 | 1 <!-- BEGIN backout.non-tip.backout --> |
| Giulio@793 | 2 <screen><prompt>$</prompt> <userinput>echo terza modifica >> miofile</userinput> |
| gpiancastelli@850 | 3 <prompt>$</prompt> <userinput>hg commit -m "Terza modifica."</userinput> |
| gpiancastelli@850 | 4 <prompt>$</prompt> <userinput>hg backout --merge -m "Ritira la seconda modifica." 1</userinput> |
| Giulio@793 | 5 ripristino miofile |
| Giulio@793 | 6 creata una nuova testa |
| Giulio@793 | 7 il changeset 3:af281715005d ritira il changeset 1:51969da8cdc5 |
| Giulio@793 | 8 unisco con il changeset 3:af281715005d |
| Giulio@793 | 9 unisco miofile |
| Giulio@793 | 10 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti |
| Giulio@793 | 11 (unione tra rami, ricordatevi di eseguire il commit) |
| Giulio@793 | 12 </screen> |
| Giulio@793 | 13 <!-- END backout.non-tip.backout --> |