Mercurial > hgbook
annotate en/examples/mq.tutorial.qrefresh.out @ 288:cac3ac4536e5
Better wording, again per Jim Blandy.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 18 Jan 2008 12:01:46 -0800 |
parents | 00f69e8825c5 |
children | bd8d96d3703d |
rev | line source |
---|---|
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{echo 'line 2' >> file1} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{hg diff} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 diff -r file1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 |
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,1 +1,2 @@ line 1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 line 1 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 +line 2 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 $ \textbf{hg qrefresh} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 $ \textbf{hg diff} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 $ \textbf{hg tip --style=compact --patch} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 1[qtip,first.patch,tip,qbase] |
273
00f69e8825c5
Bring book up to date with recent changes.
Bryan O'Sullivan <bos@serpentine.com>
parents:
144
diff
changeset
|
13 [mq]: first.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 |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 @@ -1,1 +1,2 @@ line 1 |
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 |