13 $ cd repo |
13 $ cd repo |
14 |
14 |
15 $ echo a > a |
15 $ echo a > a |
16 $ hg branch a |
16 $ hg branch a |
17 marked working directory as branch a |
17 marked working directory as branch a |
|
18 (branches are permanent and global, did you want a bookmark?) |
18 $ hg ci -Aqm0 |
19 $ hg ci -Aqm0 |
19 |
20 |
20 $ echo b > b |
21 $ echo b > b |
21 $ hg branch b |
22 $ hg branch b |
22 marked working directory as branch b |
23 marked working directory as branch b |
|
24 (branches are permanent and global, did you want a bookmark?) |
23 $ hg ci -Aqm1 |
25 $ hg ci -Aqm1 |
24 |
26 |
25 $ rm a |
27 $ rm a |
26 $ hg branch a-b-c- |
28 $ hg branch a-b-c- |
27 marked working directory as branch a-b-c- |
29 marked working directory as branch a-b-c- |
|
30 (branches are permanent and global, did you want a bookmark?) |
28 $ hg ci -Aqm2 -u Bob |
31 $ hg ci -Aqm2 -u Bob |
29 |
32 |
30 $ hg co 1 |
33 $ hg co 1 |
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 $ hg branch +a+b+c+ |
35 $ hg branch +a+b+c+ |
33 marked working directory as branch +a+b+c+ |
36 marked working directory as branch +a+b+c+ |
|
37 (branches are permanent and global, did you want a bookmark?) |
34 $ hg ci -Aqm3 |
38 $ hg ci -Aqm3 |
35 |
39 |
36 $ hg co 2 # interleave |
40 $ hg co 2 # interleave |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 $ echo bb > b |
42 $ echo bb > b |
39 $ hg branch -- -a-b-c- |
43 $ hg branch -- -a-b-c- |
40 marked working directory as branch -a-b-c- |
44 marked working directory as branch -a-b-c- |
|
45 (branches are permanent and global, did you want a bookmark?) |
41 $ hg ci -Aqm4 -d "May 12 2005" |
46 $ hg ci -Aqm4 -d "May 12 2005" |
42 |
47 |
43 $ hg co 3 |
48 $ hg co 3 |
44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 $ hg branch /a/b/c/ |
50 $ hg branch /a/b/c/ |
46 marked working directory as branch /a/b/c/ |
51 marked working directory as branch /a/b/c/ |
|
52 (branches are permanent and global, did you want a bookmark?) |
47 $ hg ci -Aqm"5 bug" |
53 $ hg ci -Aqm"5 bug" |
48 |
54 |
49 $ hg merge 4 |
55 $ hg merge 4 |
50 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
51 (branch merge, don't forget to commit) |
57 (branch merge, don't forget to commit) |
52 $ hg branch _a_b_c_ |
58 $ hg branch _a_b_c_ |
53 marked working directory as branch _a_b_c_ |
59 marked working directory as branch _a_b_c_ |
|
60 (branches are permanent and global, did you want a bookmark?) |
54 $ hg ci -Aqm"6 issue619" |
61 $ hg ci -Aqm"6 issue619" |
55 |
62 |
56 $ hg branch .a.b.c. |
63 $ hg branch .a.b.c. |
57 marked working directory as branch .a.b.c. |
64 marked working directory as branch .a.b.c. |
|
65 (branches are permanent and global, did you want a bookmark?) |
58 $ hg ci -Aqm7 |
66 $ hg ci -Aqm7 |
59 |
67 |
60 $ hg branch all |
68 $ hg branch all |
61 marked working directory as branch all |
69 marked working directory as branch all |
|
70 (branches are permanent and global, did you want a bookmark?) |
62 $ hg ci --close-branch -Aqm8 |
71 $ hg ci --close-branch -Aqm8 |
63 abort: can only close branch heads |
72 abort: can only close branch heads |
64 [255] |
73 [255] |
65 |
74 |
66 $ hg co 4 |
75 $ hg co 4 |
67 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
68 $ hg branch é |
77 $ hg branch é |
69 marked working directory as branch \xc3\xa9 (esc) |
78 marked working directory as branch \xc3\xa9 (esc) |
|
79 (branches are permanent and global, did you want a bookmark?) |
70 $ hg ci -Aqm9 |
80 $ hg ci -Aqm9 |
71 |
81 |
72 $ hg tag -r6 1.0 |
82 $ hg tag -r6 1.0 |
73 |
83 |
74 $ hg clone --quiet -U -r 7 . ../remote1 |
84 $ hg clone --quiet -U -r 7 . ../remote1 |