221 ignoring null merge rebase of 3 |
221 ignoring null merge rebase of 3 |
222 ignoring null merge rebase of 4 |
222 ignoring null merge rebase of 4 |
223 ignoring null merge rebase of 6 |
223 ignoring null merge rebase of 6 |
224 ignoring null merge rebase of 8 |
224 ignoring null merge rebase of 8 |
225 rebasing 9:e31216eec445 "more changes to f1" |
225 rebasing 9:e31216eec445 "more changes to f1" |
226 rebasing: 9:e31216eec445 5/6 changesets (83.33%) |
|
227 future parents are 2 and -1 |
226 future parents are 2 and -1 |
228 rebase status stored |
227 rebase status stored |
229 update to 2:4bc80088dc6b |
228 update to 2:4bc80088dc6b |
230 resolving manifests |
229 resolving manifests |
231 branchmerge: False, force: True, partial: False |
230 branchmerge: False, force: True, partial: False |
232 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
231 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
233 f2.txt: other deleted -> r |
232 f2.txt: other deleted -> r |
234 removing f2.txt |
233 removing f2.txt |
235 updating: f2.txt 1/2 files (50.00%) |
|
236 f1.txt: remote created -> g |
234 f1.txt: remote created -> g |
237 getting f1.txt |
235 getting f1.txt |
238 updating: f1.txt 2/2 files (100.00%) |
|
239 merge against 9:e31216eec445 |
236 merge against 9:e31216eec445 |
240 detach base 8:8e4e2c1a07ae |
237 detach base 8:8e4e2c1a07ae |
241 searching for copies back to rev 3 |
238 searching for copies back to rev 3 |
242 resolving manifests |
239 resolving manifests |
243 branchmerge: True, force: True, partial: False |
240 branchmerge: True, force: True, partial: False |
244 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
241 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
245 f1.txt: remote is newer -> g |
242 f1.txt: remote is newer -> g |
246 getting f1.txt |
243 getting f1.txt |
247 updating: f1.txt 1/1 files (100.00%) |
|
248 committing files: |
244 committing files: |
249 f1.txt |
245 f1.txt |
250 committing manifest |
246 committing manifest |
251 committing changelog |
247 committing changelog |
252 rebased as 19c888675e13 |
248 rebased as 19c888675e13 |
253 rebasing 10:2f2496ddf49d "merge" (tip) |
249 rebasing 10:2f2496ddf49d "merge" (tip) |
254 rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) |
|
255 future parents are 11 and 7 |
250 future parents are 11 and 7 |
256 rebase status stored |
251 rebase status stored |
257 already in target |
252 already in target |
258 merge against 10:2f2496ddf49d |
253 merge against 10:2f2496ddf49d |
259 detach base 9:e31216eec445 |
254 detach base 9:e31216eec445 |
274 resolving manifests |
268 resolving manifests |
275 branchmerge: False, force: False, partial: False |
269 branchmerge: False, force: False, partial: False |
276 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
270 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
277 f1.txt: other deleted -> r |
271 f1.txt: other deleted -> r |
278 removing f1.txt |
272 removing f1.txt |
279 updating: f1.txt 1/2 files (50.00%) |
|
280 f2.txt: remote created -> g |
273 f2.txt: remote created -> g |
281 getting f2.txt |
274 getting f2.txt |
282 updating: f2.txt 2/2 files (100.00%) |
|
283 3 changesets found |
275 3 changesets found |
284 list of changesets: |
276 list of changesets: |
285 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
277 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
286 e31216eec445e44352c5f01588856059466a24c9 |
278 e31216eec445e44352c5f01588856059466a24c9 |
287 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
279 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
288 bundling: 1/3 changesets (33.33%) |
|
289 bundling: 2/3 changesets (66.67%) |
|
290 bundling: 3/3 changesets (100.00%) |
|
291 bundling: 1/3 manifests (33.33%) |
|
292 bundling: 2/3 manifests (66.67%) |
|
293 bundling: 3/3 manifests (100.00%) |
|
294 bundling: f1.txt 1/1 files (100.00%) |
|
295 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob) |
280 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob) |
296 3 changesets found |
281 3 changesets found |
297 list of changesets: |
282 list of changesets: |
298 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
283 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
299 19c888675e133ab5dff84516926a65672eaf04d9 |
284 19c888675e133ab5dff84516926a65672eaf04d9 |
300 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
285 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
301 bundling: 1/3 changesets (33.33%) |
|
302 bundling: 2/3 changesets (66.67%) |
|
303 bundling: 3/3 changesets (100.00%) |
|
304 bundling: 1/3 manifests (33.33%) |
|
305 bundling: 2/3 manifests (66.67%) |
|
306 bundling: 3/3 manifests (100.00%) |
|
307 bundling: f1.txt 1/1 files (100.00%) |
|
308 adding branch |
286 adding branch |
309 adding changesets |
287 adding changesets |
310 changesets: 1 chunks |
|
311 add changeset 4c9fbe56a16f |
288 add changeset 4c9fbe56a16f |
312 changesets: 2 chunks |
|
313 add changeset 19c888675e13 |
289 add changeset 19c888675e13 |
314 changesets: 3 chunks |
|
315 add changeset 2a7f09cac94c |
290 add changeset 2a7f09cac94c |
316 adding manifests |
291 adding manifests |
317 manifests: 1/2 chunks (50.00%) |
|
318 manifests: 2/2 chunks (100.00%) |
|
319 manifests: 3/2 chunks (150.00%) |
|
320 adding file changes |
292 adding file changes |
321 adding f1.txt revisions |
293 adding f1.txt revisions |
322 files: 1/1 chunks (100.00%) |
|
323 added 2 changesets with 2 changes to 1 files |
294 added 2 changesets with 2 changes to 1 files |
324 invalid branchheads cache (served): tip differs |
295 invalid branchheads cache (served): tip differs |
325 rebase completed |
296 rebase completed |
326 updating the branch cache |
297 updating the branch cache |
327 truncating cache/rbc-revs-v1 to 72 |
298 truncating cache/rbc-revs-v1 to 72 |