hgbook
annotate ja/examples/mq.tutorial.qnew2.out @ 980:c40dac4f63d8
merge with Jean Marie Clément
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 18:55:53 2009 +0200 (2009-09-04) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg qnew second.patch} |
| foozy@708 | 2 $ \textbf{hg log --style=compact --limit=2} |
| foozy@708 | 3 2[qtip,second.patch,tip] |
| foozy@708 | 4 [mq]: second.patch |
| foozy@708 | 5 |
| foozy@708 | 6 1[first.patch,qbase] |
| foozy@708 | 7 [mq]: first.patch |
| foozy@708 | 8 |
| foozy@708 | 9 $ \textbf{echo 'line 4' >> file1} |
| foozy@708 | 10 $ \textbf{hg qrefresh} |
| foozy@708 | 11 $ \textbf{hg tip --style=compact --patch} |
| foozy@708 | 12 2[qtip,second.patch,tip] |
| foozy@708 | 13 [mq]: second.patch |
| foozy@708 | 14 |
| foozy@708 | 15 diff -r -r file1 |
| foozy@708 | 16 |
| foozy@708 | 17 |
| foozy@708 | 18 @@ -1,3 +1,4 @@ line 1 |
| foozy@708 | 19 line 1 |
| foozy@708 | 20 line 2 |
| foozy@708 | 21 line 3 |
| foozy@708 | 22 +line 4 |
| foozy@708 | 23 |
| foozy@708 | 24 $ \textbf{hg annotate file1} |
| foozy@708 | 25 0: line 1 |
| foozy@708 | 26 1: line 2 |
| foozy@708 | 27 1: line 3 |
| foozy@708 | 28 2: line 4 |