hgbook

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

find changesets by author, revision, files, or words in the commit message
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.qrefresh.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,24 @@
     1.4 +<!-- BEGIN mq.tutorial.qrefresh -->
     1.5 +<screen><prompt>$</prompt> <userinput>echo 'riga 2' &gt;&gt; file1</userinput>
     1.6 +<prompt>$</prompt> <userinput>hg diff</userinput>
     1.7 +diff -r f32697f1a94e file1
     1.8 +--- a/file1	Fri Jun 05 15:50:57 2009 +0000
     1.9 ++++ b/file1	Fri Jun 05 15:50:58 2009 +0000
    1.10 +@@ -1,1 +1,2 @@
    1.11 + riga 1
    1.12 ++riga 2
    1.13 +<prompt>$</prompt> <userinput>hg qrefresh</userinput>
    1.14 +<prompt>$</prompt> <userinput>hg diff</userinput>
    1.15 +<prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
    1.16 +1[qtip,prima.patch,tip,qbase]   18f39bf02ad5   2009-06-05 15:50 +0000   bos
    1.17 +  [mq]: prima.patch
    1.18 +
    1.19 +diff -r c6618fa9eed7 -r 18f39bf02ad5 file1
    1.20 +--- a/file1	Fri Jun 05 15:50:56 2009 +0000
    1.21 ++++ b/file1	Fri Jun 05 15:50:59 2009 +0000
    1.22 +@@ -1,1 +1,2 @@
    1.23 + riga 1
    1.24 ++riga 2
    1.25 +
    1.26 +</screen>
    1.27 +<!-- END mq.tutorial.qrefresh -->