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