hgbook

view it/examples/mq.dodiff.diff.it @ 812:42e2c9d47ef4

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.12.
author Giulio@puck
date Sat Aug 15 15:15:39 2009 +0200 (2009-08-15)
parents
children
line source
1 <!-- BEGIN mq.dodiff.diff -->
2 <screen><prompt>$</prompt> <userinput>echo 'questo è il mio primo pensiero' &gt; vecchiofile</userinput>
3 <prompt>$</prompt> <userinput>echo 'ho cambiato idea' &gt; nuovofile</userinput>
4 <prompt>$</prompt> <userinput>diff -u vecchiofile nuovofile &gt; piccola.patch</userinput>
5 <prompt>$</prompt> <userinput>cat piccola.patch</userinput>
6 --- vecchiofile 2009-06-05 15:50:32.000000000 +0000
7 +++ nuovofile 2009-06-05 15:50:32.000000000 +0000
8 @@ -1 +1 @@
9 -questo è il mio primo pensiero
10 +ho cambiato idea
11 <prompt>$</prompt> <userinput>patch &lt; piccola.patch</userinput>
12 correggo il file vecchiofile
13 <prompt>$</prompt> <userinput>cat vecchiofile</userinput>
14 ho cambiato idea
15 </screen>
16 <!-- END mq.dodiff.diff -->