163 changeset: 1:ef3a871183d7 |
163 changeset: 1:ef3a871183d7 |
164 user: test |
164 user: test |
165 date: Thu Jan 01 00:00:00 1970 +0000 |
165 date: Thu Jan 01 00:00:00 1970 +0000 |
166 summary: b |
166 summary: b |
167 |
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 |
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
169 % applied patches before strip |
266 % applied patches before strip |
170 2.diff |
267 2.diff |
171 3.diff |
268 3.diff |
172 4.diff |
269 4.diff |