hgbook

diff it/examples/mq.tutorial.add.it @ 1086:8ce6c7a3ebd2

find changesets by author, revision, files, or words in the commit message
2.4.3 zh translated finished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 08:03:26 2009 -0500 (2009-11-20)
parents 42e2c9d47ef4
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/mq.tutorial.add.it	Sat Aug 15 15:15:39 2009 +0200
     1.2 +++ b/it/examples/mq.tutorial.add.it	Fri Nov 20 08:03:26 2009 -0500
     1.3 @@ -1,7 +1,8 @@
     1.4  <!-- BEGIN mq.tutorial.add -->
     1.5  <screen><prompt>$</prompt> <userinput>echo 'file 3, riga 1' &gt;&gt; file3</userinput>
     1.6 -<prompt>$</prompt> <userinput>hg qnew aggiunta-file3.patch</userinput>
     1.7 -<prompt>$</prompt> <userinput>hg qnew -f aggiunta-file3.patch</userinput>
     1.8 -fallimento: la patch "aggiunta-file3.patch" esiste già
     1.9 +<prompt>$</prompt> <userinput>hg add file3</userinput>
    1.10 +<prompt>$</prompt> <userinput>hg qnew aggiunto-file3.patch</userinput>
    1.11 +fallimento: ci sono modifiche locali, aggiornate prima la patch corrente
    1.12 +<prompt>$</prompt> <userinput>hg qnew -f aggiunto-file3.patch</userinput>
    1.13  </screen>
    1.14  <!-- END mq.tutorial.add -->