hgbook
annotate it/examples/mq.tutorial.qrefresh2.it @ 812:42e2c9d47ef4
Minor changes and translation of code snippets for Ch.12.
| author | Giulio@puck |
|---|---|
| date | Sat Aug 15 15:15:39 2009 +0200 (2009-08-15) |
| parents | |
| children | 1856c2f4835c |
| rev | line source |
|---|---|
| Giulio@812 | 1 <!-- BEGIN mq.tutorial.qrefresh2 --> |
| Giulio@812 | 2 <screen><prompt>$</prompt> <userinput>echo 'riga 3' >> file1</userinput> |
| Giulio@812 | 3 <prompt>$</prompt> <userinput>hg status</userinput> |
| Giulio@812 | 4 M file1 |
| Giulio@812 | 5 <prompt>$</prompt> <userinput>hg qrefresh</userinput> |
| Giulio@812 | 6 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> |
| Giulio@812 | 7 1[qtip,prima.patch,tip,qbase] 8593307a06ec 2009-06-05 15:51 +0000 bos |
| Giulio@812 | 8 [mq]: prima.patch |
| Giulio@812 | 9 |
| Giulio@812 | 10 diff -r c6618fa9eed7 -r 8593307a06ec file1 |
| Giulio@812 | 11 --- a/file1 Fri Jun 05 15:50:56 2009 +0000 |
| Giulio@812 | 12 +++ b/file1 Fri Jun 05 15:51:00 2009 +0000 |
| Giulio@812 | 13 @@ -1,1 +1,3 @@ |
| Giulio@812 | 14 line 1 |
| Giulio@812 | 15 +riga 2 |
| Giulio@812 | 16 +riga 3 |
| Giulio@812 | 17 |
| Giulio@812 | 18 </screen> |
| Giulio@812 | 19 <!-- END mq.tutorial.qrefresh2 --> |