hgbook
annotate ja/examples/branch-repo @ 1061:825259963afd
1.8 zh first 3 paras translated
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Tue Nov 10 21:46:41 2009 -0500 (2009-11-10) |
parents | |
children |
rev | line source |
---|---|
foozy@708 | 1 #!/bin/bash |
foozy@708 | 2 |
foozy@708 | 3 hg init myproject |
foozy@708 | 4 cd myproject |
foozy@708 | 5 echo hello > myfile |
foozy@708 | 6 hg commit -A -m 'Initial commit' |
foozy@708 | 7 cd .. |
foozy@708 | 8 |
foozy@708 | 9 #$ name: tag |
foozy@708 | 10 |
foozy@708 | 11 cd myproject |
foozy@708 | 12 hg tag v1.0 |
foozy@708 | 13 |
foozy@708 | 14 #$ name: clone |
foozy@708 | 15 |
foozy@708 | 16 cd .. |
foozy@708 | 17 hg clone myproject myproject-1.0.1 |
foozy@708 | 18 |
foozy@708 | 19 #$ name: bugfix |
foozy@708 | 20 |
foozy@708 | 21 hg clone myproject-1.0.1 my-1.0.1-bugfix |
foozy@708 | 22 cd my-1.0.1-bugfix |
foozy@708 | 23 echo 'I fixed a bug using only echo!' >> myfile |
foozy@708 | 24 hg commit -m 'Important fix for 1.0.1' |
foozy@708 | 25 #$ ignore: /tmp/branch-repo.* |
foozy@708 | 26 hg push |
foozy@708 | 27 |
foozy@708 | 28 #$ name: new |
foozy@708 | 29 |
foozy@708 | 30 cd .. |
foozy@708 | 31 hg clone myproject my-feature |
foozy@708 | 32 cd my-feature |
foozy@708 | 33 echo 'This sure is an exciting new feature!' > mynewfile |
foozy@708 | 34 hg commit -A -m 'New feature' |
foozy@708 | 35 hg push |
foozy@708 | 36 |
foozy@708 | 37 #$ name: pull |
foozy@708 | 38 |
foozy@708 | 39 cd .. |
foozy@708 | 40 hg clone myproject myproject-merge |
foozy@708 | 41 cd myproject-merge |
foozy@708 | 42 hg pull ../myproject-1.0.1 |
foozy@708 | 43 |
foozy@708 | 44 #$ name: merge |
foozy@708 | 45 |
foozy@708 | 46 hg merge |
foozy@708 | 47 hg commit -m 'Merge bugfix from 1.0.1 branch' |
foozy@708 | 48 hg push |