277 % Try to rollback after a rebase (fail) |
276 % Try to rollback after a rebase (fail) |
278 no rollback information available |
277 no rollback information available |
279 |
278 |
280 % Rebase with base == '.' => same as no arguments (from 3 onto 7) |
279 % Rebase with base == '.' => same as no arguments (from 3 onto 7) |
281 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
280 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
282 saving bundle to |
|
283 adding branch |
281 adding branch |
284 adding changesets |
282 adding changesets |
285 adding manifests |
283 adding manifests |
286 adding file changes |
284 adding file changes |
287 added 5 changesets with 5 changes to 5 files |
285 added 5 changesets with 5 changes to 5 files |
288 rebase completed |
286 rebase completed |
289 |
287 |
290 % Rebase with dest == default => same as no arguments (from 3 onto 7) |
288 % Rebase with dest == default => same as no arguments (from 3 onto 7) |
291 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
289 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
292 saving bundle to |
|
293 adding branch |
290 adding branch |
294 adding changesets |
291 adding changesets |
295 adding manifests |
292 adding manifests |
296 adding file changes |
293 adding file changes |
297 added 5 changesets with 5 changes to 5 files |
294 added 5 changesets with 5 changes to 5 files |
298 rebase completed |
295 rebase completed |
299 |
296 |
300 % Specify only source (from 4 onto 7) |
297 % Specify only source (from 4 onto 7) |
301 saving bundle to |
|
302 adding branch |
298 adding branch |
303 adding changesets |
299 adding changesets |
304 adding manifests |
300 adding manifests |
305 adding file changes |
301 adding file changes |
306 added 4 changesets with 4 changes to 4 files (-1 heads) |
302 added 4 changesets with 4 changes to 4 files (-1 heads) |
307 rebase completed |
303 rebase completed |
308 |
304 |
309 % Specify only dest (from 3 onto 6) |
305 % Specify only dest (from 3 onto 6) |
310 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
306 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
311 saving bundle to |
|
312 adding branch |
307 adding branch |
313 adding changesets |
308 adding changesets |
314 adding manifests |
309 adding manifests |
315 adding file changes |
310 adding file changes |
316 added 5 changesets with 5 changes to 5 files (+1 heads) |
311 added 5 changesets with 5 changes to 5 files (+1 heads) |
317 rebase completed |
312 rebase completed |
318 |
313 |
319 % Specify only base (from 3 onto 7) |
314 % Specify only base (from 3 onto 7) |
320 saving bundle to |
|
321 adding branch |
315 adding branch |
322 adding changesets |
316 adding changesets |
323 adding manifests |
317 adding manifests |
324 adding file changes |
318 adding file changes |
325 added 5 changesets with 5 changes to 5 files |
319 added 5 changesets with 5 changes to 5 files |
326 rebase completed |
320 rebase completed |
327 |
321 |
328 % Specify source and dest (from 4 onto 6) |
322 % Specify source and dest (from 4 onto 6) |
329 saving bundle to |
|
330 adding branch |
323 adding branch |
331 adding changesets |
324 adding changesets |
332 adding manifests |
325 adding manifests |
333 adding file changes |
326 adding file changes |
334 added 4 changesets with 4 changes to 4 files |
327 added 4 changesets with 4 changes to 4 files |
335 rebase completed |
328 rebase completed |
336 |
329 |
337 % Specify base and dest (from 3 onto 6) |
330 % Specify base and dest (from 3 onto 6) |
338 saving bundle to |
|
339 adding branch |
331 adding branch |
340 adding changesets |
332 adding changesets |
341 adding manifests |
333 adding manifests |
342 adding file changes |
334 adding file changes |
343 added 5 changesets with 5 changes to 5 files (+1 heads) |
335 added 5 changesets with 5 changes to 5 files (+1 heads) |