hgbook
annotate ja/examples/mq.id.output.out @ 1113:613690ad6a9c
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg qapplied} |
| foozy@708 | 2 first.patch |
| foozy@708 | 3 second.patch |
| foozy@708 | 4 $ \textbf{hg log -r qbase:qtip} |
| foozy@708 | 5 changeset: |
| foozy@708 | 6 tag: first.patch |
| foozy@708 | 7 tag: qbase |
| foozy@708 | 8 user: Bryan O'Sullivan <bos@serpentine.com> |
| foozy@708 | 9 |
| foozy@708 | 10 summary: [mq]: first.patch |
| foozy@708 | 11 |
| foozy@708 | 12 changeset: |
| foozy@708 | 13 tag: qtip |
| foozy@708 | 14 tag: second.patch |
| foozy@708 | 15 tag: tip |
| foozy@708 | 16 user: Bryan O'Sullivan <bos@serpentine.com> |
| foozy@708 | 17 |
| foozy@708 | 18 summary: [mq]: second.patch |
| foozy@708 | 19 |
| foozy@708 | 20 $ \textbf{hg export second.patch} |
| foozy@708 | 21 # HG changeset patch |
| foozy@708 | 22 # User Bryan O'Sullivan <bos@serpentine.com> |
| foozy@708 | 23 |
| foozy@708 | 24 # Node ID |
| foozy@708 | 25 # Parent |
| foozy@708 | 26 [mq]: second.patch |
| foozy@708 | 27 |
| foozy@708 | 28 diff -r -r other.c |
| foozy@708 | 29 |
| foozy@708 | 30 |
| foozy@708 | 31 @@ -0,0 +1,1 @@ |
| foozy@708 | 32 +double u; |