Mercurial > hgbook
comparison ja/examples/branch-named @ 290:b0db5adf11c1 ja_root
fork Japanese translation.
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Wed, 06 Feb 2008 17:43:11 +0900 |
parents | en/examples/branch-named@6519f3b983b4 |
children | 019040fbf5f5 |
comparison
equal
deleted
inserted
replaced
289:7be02466421b | 290:b0db5adf11c1 |
---|---|
1 #!/bin/bash | |
2 | |
3 hg init a | |
4 cd a | |
5 echo hello > myfile | |
6 hg commit -A -m 'Initial commit' | |
7 | |
8 #$ name: branches | |
9 | |
10 hg tip | |
11 hg branches | |
12 | |
13 #$ name: branch | |
14 | |
15 hg branch | |
16 | |
17 #$ name: create | |
18 | |
19 hg branch foo | |
20 hg branch | |
21 | |
22 #$ name: status | |
23 | |
24 hg status | |
25 hg tip | |
26 | |
27 #$ name: commit | |
28 | |
29 echo 'hello again' >> myfile | |
30 hg commit -m 'Second commit' | |
31 hg tip | |
32 | |
33 #$ name: rebranch | |
34 | |
35 hg branch | |
36 hg branch bar | |
37 echo new file > newfile | |
38 hg commit -A -m 'Third commit' | |
39 hg tip | |
40 | |
41 #$ name: parents | |
42 | |
43 hg parents | |
44 hg branches | |
45 | |
46 #$ name: update-switchy | |
47 | |
48 hg update foo | |
49 hg parents | |
50 hg update bar | |
51 hg parents | |
52 | |
53 #$ name: update-nothing | |
54 | |
55 hg update foo | |
56 hg update | |
57 | |
58 #$ name: foo-commit | |
59 | |
60 echo something > somefile | |
61 hg commit -A -m 'New file' | |
62 hg heads | |
63 | |
64 #$ name: update-bar | |
65 | |
66 hg update bar | |
67 hg update -C bar | |
68 | |
69 #$ name: merge | |
70 | |
71 hg branch | |
72 hg merge | |
73 hg commit -m 'Merge' | |
74 hg tip |