1 adding bar |
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 created new head |
|
4 changeset: 4:443431ffac4f |
|
5 tag: tip |
|
6 user: test |
|
7 date: Thu Jan 01 00:00:00 1970 +0000 |
|
8 summary: e |
|
9 |
|
10 changeset: 3:65bd5f99a4a3 |
|
11 parent: 1:ef3a871183d7 |
|
12 user: test |
|
13 date: Thu Jan 01 00:00:00 1970 +0000 |
|
14 summary: d |
|
15 |
|
16 changeset: 2:264128213d29 |
|
17 user: test |
|
18 date: Thu Jan 01 00:00:00 1970 +0000 |
|
19 summary: c |
|
20 |
|
21 changeset: 1:ef3a871183d7 |
|
22 user: test |
|
23 date: Thu Jan 01 00:00:00 1970 +0000 |
|
24 summary: b |
|
25 |
|
26 changeset: 0:9ab35a2d17cb |
|
27 user: test |
|
28 date: Thu Jan 01 00:00:00 1970 +0000 |
|
29 summary: a |
|
30 |
|
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 % before update 4, strip 4 |
|
33 changeset: 4:443431ffac4f |
|
34 tag: tip |
|
35 user: test |
|
36 date: Thu Jan 01 00:00:00 1970 +0000 |
|
37 summary: e |
|
38 |
|
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 saved backup bundle to |
|
41 % after update 4, strip 4 |
|
42 changeset: 3:65bd5f99a4a3 |
|
43 tag: tip |
|
44 parent: 1:ef3a871183d7 |
|
45 user: test |
|
46 date: Thu Jan 01 00:00:00 1970 +0000 |
|
47 summary: d |
|
48 |
|
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 % before update 4, strip 3 |
|
51 changeset: 4:443431ffac4f |
|
52 tag: tip |
|
53 user: test |
|
54 date: Thu Jan 01 00:00:00 1970 +0000 |
|
55 summary: e |
|
56 |
|
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 saved backup bundle to |
|
59 % after update 4, strip 3 |
|
60 changeset: 1:ef3a871183d7 |
|
61 user: test |
|
62 date: Thu Jan 01 00:00:00 1970 +0000 |
|
63 summary: b |
|
64 |
|
65 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 % before update 1, strip 4 |
|
67 changeset: 1:ef3a871183d7 |
|
68 user: test |
|
69 date: Thu Jan 01 00:00:00 1970 +0000 |
|
70 summary: b |
|
71 |
|
72 saved backup bundle to |
|
73 % after update 1, strip 4 |
|
74 changeset: 1:ef3a871183d7 |
|
75 user: test |
|
76 date: Thu Jan 01 00:00:00 1970 +0000 |
|
77 summary: b |
|
78 |
|
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 % before update 4, strip 2 |
|
81 changeset: 4:443431ffac4f |
|
82 tag: tip |
|
83 user: test |
|
84 date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 summary: e |
|
86 |
|
87 saved backup bundle to |
|
88 % after update 4, strip 2 |
|
89 changeset: 3:443431ffac4f |
|
90 tag: tip |
|
91 user: test |
|
92 date: Thu Jan 01 00:00:00 1970 +0000 |
|
93 summary: e |
|
94 |
|
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 % before update 4, strip 1 |
|
97 changeset: 4:264128213d29 |
|
98 tag: tip |
|
99 parent: 1:ef3a871183d7 |
|
100 user: test |
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 summary: c |
|
103 |
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
105 saved backup bundle to |
|
106 % after update 4, strip 1 |
|
107 changeset: 0:9ab35a2d17cb |
|
108 tag: tip |
|
109 user: test |
|
110 date: Thu Jan 01 00:00:00 1970 +0000 |
|
111 summary: a |
|
112 |
|
113 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
114 % before update null, strip 4 |
|
115 saved backup bundle to |
|
116 % after update null, strip 4 |
|
117 changeset: 4:264128213d29 |
|
118 tag: tip |
|
119 parent: 1:ef3a871183d7 |
|
120 user: test |
|
121 date: Thu Jan 01 00:00:00 1970 +0000 |
|
122 summary: c |
|
123 |
|
124 changeset: 3:443431ffac4f |
|
125 user: test |
|
126 date: Thu Jan 01 00:00:00 1970 +0000 |
|
127 summary: e |
|
128 |
|
129 changeset: 2:65bd5f99a4a3 |
|
130 user: test |
|
131 date: Thu Jan 01 00:00:00 1970 +0000 |
|
132 summary: d |
|
133 |
|
134 changeset: 1:ef3a871183d7 |
|
135 user: test |
|
136 date: Thu Jan 01 00:00:00 1970 +0000 |
|
137 summary: b |
|
138 |
|
139 changeset: 0:9ab35a2d17cb |
|
140 user: test |
|
141 date: Thu Jan 01 00:00:00 1970 +0000 |
|
142 summary: a |
|
143 |
|
144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
145 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
146 (branch merge, don't forget to commit) |
|
147 % before strip of merge parent |
|
148 changeset: 2:65bd5f99a4a3 |
|
149 user: test |
|
150 date: Thu Jan 01 00:00:00 1970 +0000 |
|
151 summary: d |
|
152 |
|
153 changeset: 4:264128213d29 |
|
154 tag: tip |
|
155 parent: 1:ef3a871183d7 |
|
156 user: test |
|
157 date: Thu Jan 01 00:00:00 1970 +0000 |
|
158 summary: c |
|
159 |
|
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
161 saved backup bundle to |
|
162 % after strip of merge parent |
|
163 changeset: 1:ef3a871183d7 |
|
164 user: test |
|
165 date: Thu Jan 01 00:00:00 1970 +0000 |
|
166 summary: b |
|
167 |
|
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 @ changeset: 4:264128213d29 |
|
170 | tag: tip |
|
171 | parent: 1:ef3a871183d7 |
|
172 | user: test |
|
173 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
174 | summary: c |
|
175 | |
|
176 | o changeset: 3:443431ffac4f |
|
177 | | user: test |
|
178 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
179 | | summary: e |
|
180 | | |
|
181 | o changeset: 2:65bd5f99a4a3 |
|
182 |/ user: test |
|
183 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
184 | summary: d |
|
185 | |
|
186 o changeset: 1:ef3a871183d7 |
|
187 | user: test |
|
188 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
189 | summary: b |
|
190 | |
|
191 o changeset: 0:9ab35a2d17cb |
|
192 user: test |
|
193 date: Thu Jan 01 00:00:00 1970 +0000 |
|
194 summary: a |
|
195 |
|
196 % 2 is parent of 3, only one strip should happen |
|
197 saved backup bundle to |
|
198 @ changeset: 2:264128213d29 |
|
199 | tag: tip |
|
200 | user: test |
|
201 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
202 | summary: c |
|
203 | |
|
204 o changeset: 1:ef3a871183d7 |
|
205 | user: test |
|
206 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
207 | summary: b |
|
208 | |
|
209 o changeset: 0:9ab35a2d17cb |
|
210 user: test |
|
211 date: Thu Jan 01 00:00:00 1970 +0000 |
|
212 summary: a |
|
213 |
|
214 o changeset: 4:443431ffac4f |
|
215 | tag: tip |
|
216 | user: test |
|
217 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
218 | summary: e |
|
219 | |
|
220 o changeset: 3:65bd5f99a4a3 |
|
221 | parent: 1:ef3a871183d7 |
|
222 | user: test |
|
223 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
224 | summary: d |
|
225 | |
|
226 | @ changeset: 2:264128213d29 |
|
227 |/ user: test |
|
228 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
229 | summary: c |
|
230 | |
|
231 o changeset: 1:ef3a871183d7 |
|
232 | user: test |
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
234 | summary: b |
|
235 | |
|
236 o changeset: 0:9ab35a2d17cb |
|
237 user: test |
|
238 date: Thu Jan 01 00:00:00 1970 +0000 |
|
239 summary: a |
|
240 |
|
241 % 2 different branches: 2 strips |
|
242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
243 saved backup bundle to |
|
244 saved backup bundle to |
|
245 @ changeset: 2:65bd5f99a4a3 |
|
246 | tag: tip |
|
247 | user: test |
|
248 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
249 | summary: d |
|
250 | |
|
251 o changeset: 1:ef3a871183d7 |
|
252 | user: test |
|
253 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
254 | summary: b |
|
255 | |
|
256 o changeset: 0:9ab35a2d17cb |
|
257 user: test |
|
258 date: Thu Jan 01 00:00:00 1970 +0000 |
|
259 summary: a |
|
260 |
|
261 % 2 different branches and a common ancestor: 1 strip |
|
262 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 saved backup bundle to |
|
264 saved backup bundle to |
|
265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
266 % applied patches before strip |
|
267 2.diff |
|
268 3.diff |
|
269 4.diff |
|
270 % stripping revision in queue |
|
271 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
272 saved backup bundle to |
|
273 % applied patches after stripping rev in queue |
|
274 2.diff |
|
275 % stripping ancestor of queue |
|
276 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
277 saved backup bundle to |
|
278 % applied patches after stripping ancestor of queue |
|