hgbook
view en/examples/branch-repo @ 581:1879ec732a28
Fix dependency.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Mar 13 14:22:27 2009 -0700 (2009-03-13) |
| parents | 615f3c6b30e1 |
| children |
line source
1 #!/bin/bash
3 hg init myproject
4 cd myproject
5 echo hello > myfile
6 hg commit -A -m 'Initial commit'
7 cd ..
9 #$ name: tag
11 cd myproject
12 hg tag v1.0
14 #$ name: clone
16 cd ..
17 hg clone myproject myproject-1.0.1
19 #$ name: bugfix
21 hg clone myproject-1.0.1 my-1.0.1-bugfix
22 cd my-1.0.1-bugfix
23 echo 'I fixed a bug using only echo!' >> myfile
24 hg commit -m 'Important fix for 1.0.1'
25 #$ ignore: /tmp/branch-repo.*
26 hg push
28 #$ name: new
30 cd ..
31 hg clone myproject my-feature
32 cd my-feature
33 echo 'This sure is an exciting new feature!' > mynewfile
34 hg commit -A -m 'New feature'
35 hg push
37 #$ name: pull
39 cd ..
40 hg clone myproject myproject-merge
41 cd myproject-merge
42 hg pull ../myproject-1.0.1
44 #$ name: merge
46 hg merge
47 hg commit -m 'Merge bugfix from 1.0.1 branch'
48 hg push