Mercurial > hgbook
annotate en/examples/results/mq.tutorial.qnew2.out @ 688:4bb10cfa3812
Make actual use of the preface.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 26 Mar 2009 19:58:09 -0700 |
parents | 0d5935744f87 |
children | 4432ad34b8e5 |
rev | line source |
---|---|
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
1 <screen><prompt>$</prompt> <userinput>hg qnew second.patch</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
2 <prompt>$</prompt> <userinput>hg log --style=compact --limit=2</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
3 2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos |
273
00f69e8825c5
Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
162
diff
changeset
|
4 [mq]: second.patch |
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
6 1[first.patch,qbase] 2009-03-10 04:38 +0000 bos |
273
00f69e8825c5
Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
162
diff
changeset
|
7 [mq]: first.patch |
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
9 <prompt>$</prompt> <userinput>echo 'line 4' >> file1</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
10 <prompt>$</prompt> <userinput>hg qrefresh</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
11 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
12 2[qtip,second.patch,tip] 2009-03-10 04:38 +0000 bos |
273
00f69e8825c5
Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
162
diff
changeset
|
13 [mq]: second.patch |
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 diff -r -r file1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
396
bd8d96d3703d
Fix sample output for 'mq' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
273
diff
changeset
|
18 @@ -1,3 +1,4 @@ |
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 line 1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 line 2 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 line 3 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 +line 4 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
24 <prompt>$</prompt> <userinput>hg annotate file1</userinput> |
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 0: line 1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 1: line 2 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 1: line 3 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 2: line 4 |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
29 </screen> |