hgbook
annotate it/examples/mq.tutorial.qrefresh.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 |
| rev | line source |
|---|---|
| Giulio@812 | 1 <!-- BEGIN mq.tutorial.qrefresh --> |
| Giulio@812 | 2 <screen><prompt>$</prompt> <userinput>echo 'riga 2' >> file1</userinput> |
| Giulio@812 | 3 <prompt>$</prompt> <userinput>hg diff</userinput> |
| Giulio@812 | 4 diff -r f32697f1a94e file1 |
| Giulio@812 | 5 --- a/file1 Fri Jun 05 15:50:57 2009 +0000 |
| Giulio@812 | 6 +++ b/file1 Fri Jun 05 15:50:58 2009 +0000 |
| Giulio@812 | 7 @@ -1,1 +1,2 @@ |
| Giulio@812 | 8 riga 1 |
| Giulio@812 | 9 +riga 2 |
| Giulio@812 | 10 <prompt>$</prompt> <userinput>hg qrefresh</userinput> |
| Giulio@812 | 11 <prompt>$</prompt> <userinput>hg diff</userinput> |
| Giulio@812 | 12 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> |
| Giulio@812 | 13 1[qtip,prima.patch,tip,qbase] 18f39bf02ad5 2009-06-05 15:50 +0000 bos |
| Giulio@812 | 14 [mq]: prima.patch |
| Giulio@812 | 15 |
| Giulio@812 | 16 diff -r c6618fa9eed7 -r 18f39bf02ad5 file1 |
| Giulio@812 | 17 --- a/file1 Fri Jun 05 15:50:56 2009 +0000 |
| Giulio@812 | 18 +++ b/file1 Fri Jun 05 15:50:59 2009 +0000 |
| Giulio@812 | 19 @@ -1,1 +1,2 @@ |
| Giulio@812 | 20 riga 1 |
| Giulio@812 | 21 +riga 2 |
| Giulio@812 | 22 |
| Giulio@812 | 23 </screen> |
| Giulio@812 | 24 <!-- END mq.tutorial.qrefresh --> |