hgbook
annotate es/examples/branch-repo @ 372:b73654de597e
translated up to section 1.8.6 and updated the project status
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Sun Oct 26 22:28:28 2008 -0500 (2008-10-26) |
| parents | |
| children |
| rev | line source |
|---|---|
| igor@333 | 1 #!/bin/bash |
| igor@333 | 2 |
| igor@333 | 3 hg init myproject |
| igor@333 | 4 cd myproject |
| igor@333 | 5 echo hello > myfile |
| igor@333 | 6 hg commit -A -m 'Initial commit' |
| igor@333 | 7 cd .. |
| igor@333 | 8 |
| igor@333 | 9 #$ name: tag |
| igor@333 | 10 |
| igor@333 | 11 cd myproject |
| igor@333 | 12 hg tag v1.0 |
| igor@333 | 13 |
| igor@333 | 14 #$ name: clone |
| igor@333 | 15 |
| igor@333 | 16 cd .. |
| igor@333 | 17 hg clone myproject myproject-1.0.1 |
| igor@333 | 18 |
| igor@333 | 19 #$ name: bugfix |
| igor@333 | 20 |
| igor@333 | 21 hg clone myproject-1.0.1 my-1.0.1-bugfix |
| igor@333 | 22 cd my-1.0.1-bugfix |
| igor@333 | 23 echo 'I fixed a bug using only echo!' >> myfile |
| igor@333 | 24 hg commit -m 'Important fix for 1.0.1' |
| igor@333 | 25 #$ ignore: /tmp/branch-repo.* |
| igor@333 | 26 hg push |
| igor@333 | 27 |
| igor@333 | 28 #$ name: new |
| igor@333 | 29 |
| igor@333 | 30 cd .. |
| igor@333 | 31 hg clone myproject my-feature |
| igor@333 | 32 cd my-feature |
| igor@333 | 33 echo 'This sure is an exciting new feature!' > mynewfile |
| igor@333 | 34 hg commit -A -m 'New feature' |
| igor@333 | 35 hg push |
| igor@333 | 36 |
| igor@333 | 37 #$ name: pull |
| igor@333 | 38 |
| igor@333 | 39 cd .. |
| igor@333 | 40 hg clone myproject myproject-merge |
| igor@333 | 41 cd myproject-merge |
| igor@333 | 42 hg pull ../myproject-1.0.1 |
| igor@333 | 43 |
| igor@333 | 44 #$ name: merge |
| igor@333 | 45 |
| igor@333 | 46 hg merge |
| igor@333 | 47 hg commit -m 'Merge bugfix from 1.0.1 branch' |
| igor@333 | 48 hg push |