hgbook
annotate ja/examples/branch-named @ 719:eca3a16c0114
Merge with dongsheng
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Aug 14 12:12:19 2009 -0700 (2009-08-14) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 #!/bin/bash |
| foozy@708 | 2 |
| foozy@708 | 3 hg init a |
| foozy@708 | 4 cd a |
| foozy@708 | 5 echo hello > myfile |
| foozy@708 | 6 hg commit -A -m 'Initial commit' |
| foozy@708 | 7 |
| foozy@708 | 8 #$ name: branches |
| foozy@708 | 9 |
| foozy@708 | 10 hg tip |
| foozy@708 | 11 hg branches |
| foozy@708 | 12 |
| foozy@708 | 13 #$ name: branch |
| foozy@708 | 14 |
| foozy@708 | 15 hg branch |
| foozy@708 | 16 |
| foozy@708 | 17 #$ name: create |
| foozy@708 | 18 |
| foozy@708 | 19 hg branch foo |
| foozy@708 | 20 hg branch |
| foozy@708 | 21 |
| foozy@708 | 22 #$ name: status |
| foozy@708 | 23 |
| foozy@708 | 24 hg status |
| foozy@708 | 25 hg tip |
| foozy@708 | 26 |
| foozy@708 | 27 #$ name: commit |
| foozy@708 | 28 |
| foozy@708 | 29 echo 'hello again' >> myfile |
| foozy@708 | 30 hg commit -m 'Second commit' |
| foozy@708 | 31 hg tip |
| foozy@708 | 32 |
| foozy@708 | 33 #$ name: rebranch |
| foozy@708 | 34 |
| foozy@708 | 35 hg branch |
| foozy@708 | 36 hg branch bar |
| foozy@708 | 37 echo new file > newfile |
| foozy@708 | 38 hg commit -A -m 'Third commit' |
| foozy@708 | 39 hg tip |
| foozy@708 | 40 |
| foozy@708 | 41 #$ name: parents |
| foozy@708 | 42 |
| foozy@708 | 43 hg parents |
| foozy@708 | 44 hg branches |
| foozy@708 | 45 |
| foozy@708 | 46 #$ name: update-switchy |
| foozy@708 | 47 |
| foozy@708 | 48 hg update foo |
| foozy@708 | 49 hg parents |
| foozy@708 | 50 hg update bar |
| foozy@708 | 51 hg parents |
| foozy@708 | 52 |
| foozy@708 | 53 #$ name: update-nothing |
| foozy@708 | 54 |
| foozy@708 | 55 hg update foo |
| foozy@708 | 56 hg update |
| foozy@708 | 57 |
| foozy@708 | 58 #$ name: foo-commit |
| foozy@708 | 59 |
| foozy@708 | 60 echo something > somefile |
| foozy@708 | 61 hg commit -A -m 'New file' |
| foozy@708 | 62 hg heads |
| foozy@708 | 63 |
| foozy@708 | 64 #$ name: update-bar |
| foozy@708 | 65 |
| foozy@708 | 66 hg update bar |
| foozy@708 | 67 hg update -C bar |
| foozy@708 | 68 |
| foozy@708 | 69 #$ name: merge |
| foozy@708 | 70 |
| foozy@708 | 71 hg branch |
| foozy@708 | 72 hg merge |
| foozy@708 | 73 hg commit -m 'Merge' |
| foozy@708 | 74 hg tip |