Show More
@@ -1,174 +1,179 b'' | |||||
1 | marked working directory as branch foo |
|
1 | marked working directory as branch foo | |
2 | foo |
|
2 | foo | |
3 | marked working directory as branch bar |
|
3 | marked working directory as branch bar | |
4 | % branch shadowing |
|
4 | % branch shadowing | |
5 | abort: a branch of the same name already exists (use --force to override) |
|
5 | abort: a branch of the same name already exists (use --force to override) | |
6 | marked working directory as branch default |
|
6 | marked working directory as branch default | |
|
7 | % there should be only one default branch head | |||
|
8 | changeset: 3:bf1bc2f45e83 | |||
|
9 | tag: tip | |||
|
10 | user: test | |||
|
11 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
12 | summary: clear branch name | |||
|
13 | ||||
7 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | foo |
|
15 | foo | |
9 | created new head |
|
16 | created new head | |
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | (branch merge, don't forget to commit) |
|
18 | (branch merge, don't forget to commit) | |
12 | foo |
|
19 | foo | |
13 | changeset: 5:5f8fb06e083e |
|
20 | changeset: 5:5f8fb06e083e | |
14 | branch: foo |
|
21 | branch: foo | |
15 | tag: tip |
|
22 | tag: tip | |
16 | parent: 4:4909a3732169 |
|
23 | parent: 4:4909a3732169 | |
17 | parent: 3:bf1bc2f45e83 |
|
24 | parent: 3:bf1bc2f45e83 | |
18 | user: test |
|
25 | user: test | |
19 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
26 | date: Mon Jan 12 13:46:40 1970 +0000 | |
20 | summary: merge |
|
27 | summary: merge | |
21 |
|
28 | |||
22 | changeset: 4:4909a3732169 |
|
29 | changeset: 4:4909a3732169 | |
23 | branch: foo |
|
30 | branch: foo | |
24 | parent: 1:b699b1cec9c2 |
|
31 | parent: 1:b699b1cec9c2 | |
25 | user: test |
|
32 | user: test | |
26 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
33 | date: Mon Jan 12 13:46:40 1970 +0000 | |
27 | summary: modify a branch |
|
34 | summary: modify a branch | |
28 |
|
35 | |||
29 | changeset: 3:bf1bc2f45e83 |
|
36 | changeset: 3:bf1bc2f45e83 | |
30 | user: test |
|
37 | user: test | |
31 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
38 | date: Mon Jan 12 13:46:40 1970 +0000 | |
32 | summary: clear branch name |
|
39 | summary: clear branch name | |
33 |
|
40 | |||
34 | changeset: 2:67ec16bde7f1 |
|
41 | changeset: 2:67ec16bde7f1 | |
35 | branch: bar |
|
42 | branch: bar | |
36 | user: test |
|
43 | user: test | |
37 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
44 | date: Mon Jan 12 13:46:40 1970 +0000 | |
38 | summary: change branch name |
|
45 | summary: change branch name | |
39 |
|
46 | |||
40 | changeset: 1:b699b1cec9c2 |
|
47 | changeset: 1:b699b1cec9c2 | |
41 | branch: foo |
|
48 | branch: foo | |
42 | user: test |
|
49 | user: test | |
43 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
50 | date: Mon Jan 12 13:46:40 1970 +0000 | |
44 | summary: add branch name |
|
51 | summary: add branch name | |
45 |
|
52 | |||
46 | changeset: 0:be8523e69bf8 |
|
53 | changeset: 0:be8523e69bf8 | |
47 | user: test |
|
54 | user: test | |
48 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
55 | date: Mon Jan 12 13:46:40 1970 +0000 | |
49 | summary: initial |
|
56 | summary: initial | |
50 |
|
57 | |||
51 | foo 5:5f8fb06e083e |
|
58 | foo 5:5f8fb06e083e | |
52 | default 3:bf1bc2f45e83 (inactive) |
|
59 | default 3:bf1bc2f45e83 (inactive) | |
53 | bar 2:67ec16bde7f1 (inactive) |
|
60 | bar 2:67ec16bde7f1 (inactive) | |
54 | foo |
|
61 | foo | |
55 | default |
|
62 | default | |
56 | bar |
|
63 | bar | |
57 | % test for invalid branch cache |
|
64 | % test for invalid branch cache | |
58 | rolling back last transaction |
|
65 | rolling back last transaction | |
59 | changeset: 4:4909a3732169 |
|
66 | changeset: 4:4909a3732169 | |
60 | branch: foo |
|
67 | branch: foo | |
61 | tag: tip |
|
68 | tag: tip | |
62 | parent: 1:b699b1cec9c2 |
|
69 | parent: 1:b699b1cec9c2 | |
63 | user: test |
|
70 | user: test | |
64 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
71 | date: Mon Jan 12 13:46:40 1970 +0000 | |
65 | summary: modify a branch |
|
72 | summary: modify a branch | |
66 |
|
73 | |||
67 | invalidating branch cache (tip differs) |
|
74 | invalidating branch cache (tip differs) | |
68 | changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f |
|
75 | changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
69 | branch: foo |
|
76 | branch: foo | |
70 | tag: tip |
|
77 | tag: tip | |
71 | parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 |
|
78 | parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 | |
72 | parent: -1:0000000000000000000000000000000000000000 |
|
79 | parent: -1:0000000000000000000000000000000000000000 | |
73 | manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a |
|
80 | manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a | |
74 | user: test |
|
81 | user: test | |
75 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
82 | date: Mon Jan 12 13:46:40 1970 +0000 | |
76 | files: a |
|
83 | files: a | |
77 | extra: branch=foo |
|
84 | extra: branch=foo | |
78 | description: |
|
85 | description: | |
79 | modify a branch |
|
86 | modify a branch | |
80 |
|
87 | |||
81 |
|
88 | |||
82 | 4:4909a3732169 |
|
89 | 4:4909a3732169 | |
83 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
|
90 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | |
84 | be8523e69bf892e25817fc97187516b3c0804ae4 default |
|
|||
85 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default |
|
91 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default | |
86 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
|
92 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | |
87 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
|
93 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar | |
88 | % push should update the branch cache |
|
94 | % push should update the branch cache | |
89 | % pushing just rev 0 |
|
95 | % pushing just rev 0 | |
90 | be8523e69bf892e25817fc97187516b3c0804ae4 0 |
|
96 | be8523e69bf892e25817fc97187516b3c0804ae4 0 | |
91 | be8523e69bf892e25817fc97187516b3c0804ae4 default |
|
97 | be8523e69bf892e25817fc97187516b3c0804ae4 default | |
92 | % pushing everything |
|
98 | % pushing everything | |
93 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
|
99 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | |
94 | be8523e69bf892e25817fc97187516b3c0804ae4 default |
|
|||
95 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default |
|
100 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default | |
96 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
|
101 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | |
97 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
|
102 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar | |
98 | % update with no arguments: tipmost revision of the current branch |
|
103 | % update with no arguments: tipmost revision of the current branch | |
99 | bf1bc2f45e83 |
|
104 | bf1bc2f45e83 | |
100 | 4909a3732169 (foo) tip |
|
105 | 4909a3732169 (foo) tip | |
101 | marked working directory as branch foobar |
|
106 | marked working directory as branch foobar | |
102 | abort: branch foobar not found |
|
107 | abort: branch foobar not found | |
103 | % fastforward merge |
|
108 | % fastforward merge | |
104 | marked working directory as branch ff |
|
109 | marked working directory as branch ff | |
105 | adding ff |
|
110 | adding ff | |
106 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
111 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
107 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
108 | (branch merge, don't forget to commit) |
|
113 | (branch merge, don't forget to commit) | |
109 | foo |
|
114 | foo | |
110 | changeset: 6:f0c74f92a385 |
|
115 | changeset: 6:f0c74f92a385 | |
111 | branch: foo |
|
116 | branch: foo | |
112 | tag: tip |
|
117 | tag: tip | |
113 | parent: 4:4909a3732169 |
|
118 | parent: 4:4909a3732169 | |
114 | parent: 5:c420d2121b71 |
|
119 | parent: 5:c420d2121b71 | |
115 | user: test |
|
120 | user: test | |
116 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
121 | date: Mon Jan 12 13:46:40 1970 +0000 | |
117 | summary: Merge ff into foo |
|
122 | summary: Merge ff into foo | |
118 |
|
123 | |||
119 | a |
|
124 | a | |
120 | ff |
|
125 | ff | |
121 | % test merging, add 3 default heads and one test head |
|
126 | % test merging, add 3 default heads and one test head | |
122 | adding a |
|
127 | adding a | |
123 | adding b |
|
128 | adding b | |
124 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
129 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
125 | adding c |
|
130 | adding c | |
126 | created new head |
|
131 | created new head | |
127 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
128 | adding d |
|
133 | adding d | |
129 | created new head |
|
134 | created new head | |
130 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
135 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
131 | marked working directory as branch test |
|
136 | marked working directory as branch test | |
132 | adding e |
|
137 | adding e | |
133 | created new head |
|
138 | created new head | |
134 | changeset: 4:3a1e01ed1df4 |
|
139 | changeset: 4:3a1e01ed1df4 | |
135 | branch: test |
|
140 | branch: test | |
136 | tag: tip |
|
141 | tag: tip | |
137 | parent: 0:cb9a9f314b8b |
|
142 | parent: 0:cb9a9f314b8b | |
138 | user: test |
|
143 | user: test | |
139 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
144 | date: Thu Jan 01 00:00:00 1970 +0000 | |
140 | summary: e |
|
145 | summary: e | |
141 |
|
146 | |||
142 | changeset: 3:980f7dc84c29 |
|
147 | changeset: 3:980f7dc84c29 | |
143 | parent: 0:cb9a9f314b8b |
|
148 | parent: 0:cb9a9f314b8b | |
144 | user: test |
|
149 | user: test | |
145 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
150 | date: Thu Jan 01 00:00:00 1970 +0000 | |
146 | summary: d |
|
151 | summary: d | |
147 |
|
152 | |||
148 | changeset: 2:d36c0562f908 |
|
153 | changeset: 2:d36c0562f908 | |
149 | parent: 0:cb9a9f314b8b |
|
154 | parent: 0:cb9a9f314b8b | |
150 | user: test |
|
155 | user: test | |
151 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:00 1970 +0000 | |
152 | summary: c |
|
157 | summary: c | |
153 |
|
158 | |||
154 | changeset: 1:d2ae7f538514 |
|
159 | changeset: 1:d2ae7f538514 | |
155 | user: test |
|
160 | user: test | |
156 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
161 | date: Thu Jan 01 00:00:00 1970 +0000 | |
157 | summary: b |
|
162 | summary: b | |
158 |
|
163 | |||
159 | changeset: 0:cb9a9f314b8b |
|
164 | changeset: 0:cb9a9f314b8b | |
160 | user: test |
|
165 | user: test | |
161 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
166 | date: Thu Jan 01 00:00:00 1970 +0000 | |
162 | summary: a |
|
167 | summary: a | |
163 |
|
168 | |||
164 | % implicit merge with test branch as parent |
|
169 | % implicit merge with test branch as parent | |
165 | abort: branch 'test' has one head - please merge with an explicit rev |
|
170 | abort: branch 'test' has one head - please merge with an explicit rev | |
166 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
171 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
167 | % implicit merge with default branch as parent |
|
172 | % implicit merge with default branch as parent | |
168 | abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
173 | abort: branch 'default' has 3 heads - please merge with an explicit rev | |
169 | % 3 branch heads, explicit merge required |
|
174 | % 3 branch heads, explicit merge required | |
170 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
171 | (branch merge, don't forget to commit) |
|
176 | (branch merge, don't forget to commit) | |
172 | % 2 branch heads, implicit merge works |
|
177 | % 2 branch heads, implicit merge works | |
173 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
178 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
174 | (branch merge, don't forget to commit) |
|
179 | (branch merge, don't forget to commit) |
General Comments 0
You need to be logged in to leave comments.
Login now