Mercurial > hgbook

annotate en/examples/results/mq.tutorial.qrefresh.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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>echo 'line 2' &gt;&gt; file1</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <prompt>$</prompt> <userinput>hg diff</userinput>
144
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
396
bd8d96d3703d Fix sample output for 'mq' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 273
diff changeset
6 @@ -1,1 +1,2 @@
144
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
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
9 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
10 <prompt>$</prompt> <userinput>hg diff</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 1[qtip,first.patch,tip,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: 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
396
bd8d96d3703d Fix sample output for 'mq' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 273
diff changeset
18 @@ -1,1 +1,2 @@
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
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
22 </screen>