hgbook

diff it/examples/mq.tutorial.qnew2.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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/mq.tutorial.qnew2.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,31 @@
     1.4 +<!-- BEGIN mq.tutorial.qnew2 -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg qnew seconda.patch</userinput>
     1.6 +<prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput>
     1.7 +2[qtip,seconda.patch,tip]   2d7ecb80769d   2009-06-05 15:51 +0000   bos
     1.8 +  [mq]: seconda.patch
     1.9 +
    1.10 +1[prima.patch,qbase]   8593307a06ec   2009-06-05 15:51 +0000   bos
    1.11 +  [mq]: prima.patch
    1.12 +
    1.13 +<prompt>$</prompt> <userinput>echo 'riga 4' &gt;&gt; file1</userinput>
    1.14 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
    1.15 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
    1.16 +2[qtip,seconda.patch,tip]   78d47e79ab59   2009-06-05 15:51 +0000   bos
    1.17 +  [mq]: seconda.patch
    1.18 +
    1.19 +diff -r 8593307a06ec -r 78d47e79ab59 file1
    1.20 +--- a/file1	Fri Jun 05 15:51:00 2009 +0000
    1.21 ++++ b/file1	Fri Jun 05 15:51:02 2009 +0000
    1.22 +@@ -1,3 +1,4 @@
    1.23 + riga 1
    1.24 + riga 2
    1.25 + riga 3
    1.26 ++riga 4
    1.27 +
    1.28 +<prompt>$</prompt> <userinput>hg annotate file1</userinput>
    1.29 +0: riga 1
    1.30 +1: riga 2
    1.31 +1: riga 3
    1.32 +2: riga 4
    1.33 +</screen>
    1.34 +<!-- END mq.tutorial.qnew2 -->