hgbook
annotate it/examples/mq.dodiff.diff.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 | |
children |
rev | line source |
---|---|
Giulio@812 | 1 <!-- BEGIN mq.dodiff.diff --> |
Giulio@812 | 2 <screen><prompt>$</prompt> <userinput>echo 'questo è il mio primo pensiero' > vecchiofile</userinput> |
Giulio@812 | 3 <prompt>$</prompt> <userinput>echo 'ho cambiato idea' > nuovofile</userinput> |
Giulio@812 | 4 <prompt>$</prompt> <userinput>diff -u vecchiofile nuovofile > piccola.patch</userinput> |
Giulio@812 | 5 <prompt>$</prompt> <userinput>cat piccola.patch</userinput> |
Giulio@812 | 6 --- vecchiofile 2009-06-05 15:50:32.000000000 +0000 |
Giulio@812 | 7 +++ nuovofile 2009-06-05 15:50:32.000000000 +0000 |
Giulio@812 | 8 @@ -1 +1 @@ |
Giulio@812 | 9 -questo è il mio primo pensiero |
Giulio@812 | 10 +ho cambiato idea |
Giulio@812 | 11 <prompt>$</prompt> <userinput>patch < piccola.patch</userinput> |
Giulio@812 | 12 correggo il file vecchiofile |
Giulio@812 | 13 <prompt>$</prompt> <userinput>cat vecchiofile</userinput> |
Giulio@812 | 14 ho cambiato idea |
Giulio@812 | 15 </screen> |
Giulio@812 | 16 <!-- END mq.dodiff.diff --> |