annotate en/examples/mq.id.output.out @ 199:58e3a6c76725

More branch/merge stuff.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Apr 2007 17:37:27 -0700
parents a8cc7fa833a3
children 00f69e8825c5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
194
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{hg qapplied}
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 first.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 second.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{hg log -r qbase:qtip}
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 changeset:
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 tag: first.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 tag: qbase
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 user: Bryan O'Sullivan <bos@serpentine.com>
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 summary: patch queue: first.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 changeset:
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 tag: qtip
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 tag: second.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 tag: tip
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 user: Bryan O'Sullivan <bos@serpentine.com>
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 summary: patch queue: second.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20 $ \textbf{hg export second.patch}
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
21 # HG changeset patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
22 # User Bryan O'Sullivan <bos@serpentine.com>
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
24 # Node ID
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25 # Parent
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
26 patch queue: second.patch
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
27
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
28 diff -r -r other.c
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
29
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
30
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
31 @@ -0,0 +1,1 @@
a8cc7fa833a3 Add missed files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
32 +double u;