Mercurial > hgbook
annotate en/examples/mq.tutorial.qnew2.out @ 515:15bf7d50b586
Translated a couple of paragraphs
author | jerojasro@devnull.li |
---|---|
date | Wed, 12 Nov 2008 22:36:35 -0500 |
parents | bd8d96d3703d |
children | 5ffee9123bbf |
rev | line source |
---|---|
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{hg qnew second.patch} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{hg log --style=compact --limit=2} |
162
3fb7a7841181
Looks like hg now sorts tag names. Nice.
Bryan O'Sullivan <bos@serpentine.com>
parents:
144
diff
changeset
|
3 2[qtip,second.patch,tip] |
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 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 1[first.patch,qbase] |
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 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 $ \textbf{echo 'line 4' >> file1} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 $ \textbf{hg qrefresh} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 $ \textbf{hg tip --style=compact --patch} |
162
3fb7a7841181
Looks like hg now sorts tag names. Nice.
Bryan O'Sullivan <bos@serpentine.com>
parents:
144
diff
changeset
|
12 2[qtip,second.patch,tip] |
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 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 $ \textbf{hg annotate file1} |
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 |