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