hgbook

diff it/examples/mq.tutorial.qrefresh2.it @ 976:713f0f69029a

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/mq.tutorial.qrefresh2.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,19 @@
     1.4 +<!-- BEGIN mq.tutorial.qrefresh2 -->
     1.5 +<screen><prompt>$</prompt> <userinput>echo 'riga 3' &gt;&gt; file1</userinput>
     1.6 +<prompt>$</prompt> <userinput>hg status</userinput>
     1.7 +M file1
     1.8 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
     1.9 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
    1.10 +1[qtip,prima.patch,tip,qbase]   8593307a06ec   2009-06-05 15:51 +0000   bos
    1.11 +  [mq]: prima.patch
    1.12 +
    1.13 +diff -r c6618fa9eed7 -r 8593307a06ec file1
    1.14 +--- a/file1	Fri Jun 05 15:50:56 2009 +0000
    1.15 ++++ b/file1	Fri Jun 05 15:51:00 2009 +0000
    1.16 +@@ -1,1 +1,3 @@
    1.17 + riga 1
    1.18 ++riga 2
    1.19 ++riga 3
    1.20 +
    1.21 +</screen>
    1.22 +<!-- END mq.tutorial.qrefresh2 -->