Mercurial > hgbook
comparison es/examples/branch-repo @ 432:04c08ad7e92e
Translated svgs dummy .tex towards building
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 18 Oct 2008 07:48:21 -0500 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
431:d13a05515acf | 432:04c08ad7e92e |
---|---|
1 #!/bin/bash | |
2 | |
3 hg init myproject | |
4 cd myproject | |
5 echo hello > myfile | |
6 hg commit -A -m 'Initial commit' | |
7 cd .. | |
8 | |
9 #$ name: tag | |
10 | |
11 cd myproject | |
12 hg tag v1.0 | |
13 | |
14 #$ name: clone | |
15 | |
16 cd .. | |
17 hg clone myproject myproject-1.0.1 | |
18 | |
19 #$ name: bugfix | |
20 | |
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 | |
27 | |
28 #$ name: new | |
29 | |
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 | |
36 | |
37 #$ name: pull | |
38 | |
39 cd .. | |
40 hg clone myproject myproject-merge | |
41 cd myproject-merge | |
42 hg pull ../myproject-1.0.1 | |
43 | |
44 #$ name: merge | |
45 | |
46 hg merge | |
47 hg commit -m 'Merge bugfix from 1.0.1 branch' | |
48 hg push |