hgbook
annotate ja/examples/mq.tutorial.qrefresh2.out @ 709:f9f71850ae1a
Merge with foozy
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Aug 14 12:10:47 2009 -0700 (2009-08-14) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{echo 'line 3' >> file1} |
| foozy@708 | 2 $ \textbf{hg status} |
| foozy@708 | 3 M file1 |
| foozy@708 | 4 $ \textbf{hg qrefresh} |
| foozy@708 | 5 $ \textbf{hg tip --style=compact --patch} |
| foozy@708 | 6 1[qtip,first.patch,tip,qbase] |
| foozy@708 | 7 [mq]: first.patch |
| foozy@708 | 8 |
| foozy@708 | 9 diff -r -r file1 |
| foozy@708 | 10 |
| foozy@708 | 11 |
| foozy@708 | 12 @@ -1,1 +1,3 @@ line 1 |
| foozy@708 | 13 line 1 |
| foozy@708 | 14 +line 2 |
| foozy@708 | 15 +line 3 |
| foozy@708 | 16 |