391 (run 'hg heads' to see heads, 'hg merge' to merge) |
391 (run 'hg heads' to see heads, 'hg merge' to merge) |
392 $ hg rebase |
392 $ hg rebase |
393 getting changed largefiles |
393 getting changed largefiles |
394 1 largefiles updated, 0 removed |
394 1 largefiles updated, 0 removed |
395 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
395 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
396 $ hg log |
396 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
397 changeset: 9:598410d3eb9a |
397 9:598410d3eb9a modify normal file largefile in repo d |
398 tag: tip |
398 8:a381d2c8c80e modify normal file and largefile in repo b |
399 user: test |
399 7:daea875e9014 add/edit more largefiles |
400 date: Thu Jan 01 00:00:00 1970 +0000 |
400 6:4355d653f84f edit files yet again |
401 summary: modify normal file largefile in repo d |
401 5:9d5af5072dbd edit files again |
402 |
402 4:74c02385b94c move files |
403 changeset: 8:a381d2c8c80e |
403 3:9e8fbc4bce62 copy files |
404 user: test |
404 2:51a0ae4d5864 remove files |
405 date: Thu Jan 01 00:00:00 1970 +0000 |
405 1:ce8896473775 edit files |
406 summary: modify normal file and largefile in repo b |
406 0:30d30fe6a5be add files |
407 |
|
408 changeset: 7:daea875e9014 |
|
409 user: test |
|
410 date: Thu Jan 01 00:00:00 1970 +0000 |
|
411 summary: add/edit more largefiles |
|
412 |
|
413 changeset: 6:4355d653f84f |
|
414 user: test |
|
415 date: Thu Jan 01 00:00:00 1970 +0000 |
|
416 summary: edit files yet again |
|
417 |
|
418 changeset: 5:9d5af5072dbd |
|
419 user: test |
|
420 date: Thu Jan 01 00:00:00 1970 +0000 |
|
421 summary: edit files again |
|
422 |
|
423 changeset: 4:74c02385b94c |
|
424 user: test |
|
425 date: Thu Jan 01 00:00:00 1970 +0000 |
|
426 summary: move files |
|
427 |
|
428 changeset: 3:9e8fbc4bce62 |
|
429 user: test |
|
430 date: Thu Jan 01 00:00:00 1970 +0000 |
|
431 summary: copy files |
|
432 |
|
433 changeset: 2:51a0ae4d5864 |
|
434 user: test |
|
435 date: Thu Jan 01 00:00:00 1970 +0000 |
|
436 summary: remove files |
|
437 |
|
438 changeset: 1:ce8896473775 |
|
439 user: test |
|
440 date: Thu Jan 01 00:00:00 1970 +0000 |
|
441 summary: edit files |
|
442 |
|
443 changeset: 0:30d30fe6a5be |
|
444 user: test |
|
445 date: Thu Jan 01 00:00:00 1970 +0000 |
|
446 summary: add files |
|
447 |
|
448 $ cat normal3 |
407 $ cat normal3 |
449 normal3-modified |
408 normal3-modified |
450 $ cat sub/normal4 |
409 $ cat sub/normal4 |
451 normal4-modified |
410 normal4-modified |
452 $ cat sub/large4 |
411 $ cat sub/large4 |
463 $ hg rollback |
422 $ hg rollback |
464 repository tip rolled back to revision 9 (undo commit) |
423 repository tip rolled back to revision 9 (undo commit) |
465 working directory now based on revision 9 |
424 working directory now based on revision 9 |
466 $ hg st |
425 $ hg st |
467 M sub/large4 |
426 M sub/large4 |
468 $ hg log |
427 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
469 changeset: 9:598410d3eb9a |
428 9:598410d3eb9a modify normal file largefile in repo d |
470 tag: tip |
429 8:a381d2c8c80e modify normal file and largefile in repo b |
471 user: test |
430 7:daea875e9014 add/edit more largefiles |
472 date: Thu Jan 01 00:00:00 1970 +0000 |
431 6:4355d653f84f edit files yet again |
473 summary: modify normal file largefile in repo d |
432 5:9d5af5072dbd edit files again |
474 |
433 4:74c02385b94c move files |
475 changeset: 8:a381d2c8c80e |
434 3:9e8fbc4bce62 copy files |
476 user: test |
435 2:51a0ae4d5864 remove files |
477 date: Thu Jan 01 00:00:00 1970 +0000 |
436 1:ce8896473775 edit files |
478 summary: modify normal file and largefile in repo b |
437 0:30d30fe6a5be add files |
479 |
|
480 changeset: 7:daea875e9014 |
|
481 user: test |
|
482 date: Thu Jan 01 00:00:00 1970 +0000 |
|
483 summary: add/edit more largefiles |
|
484 |
|
485 changeset: 6:4355d653f84f |
|
486 user: test |
|
487 date: Thu Jan 01 00:00:00 1970 +0000 |
|
488 summary: edit files yet again |
|
489 |
|
490 changeset: 5:9d5af5072dbd |
|
491 user: test |
|
492 date: Thu Jan 01 00:00:00 1970 +0000 |
|
493 summary: edit files again |
|
494 |
|
495 changeset: 4:74c02385b94c |
|
496 user: test |
|
497 date: Thu Jan 01 00:00:00 1970 +0000 |
|
498 summary: move files |
|
499 |
|
500 changeset: 3:9e8fbc4bce62 |
|
501 user: test |
|
502 date: Thu Jan 01 00:00:00 1970 +0000 |
|
503 summary: copy files |
|
504 |
|
505 changeset: 2:51a0ae4d5864 |
|
506 user: test |
|
507 date: Thu Jan 01 00:00:00 1970 +0000 |
|
508 summary: remove files |
|
509 |
|
510 changeset: 1:ce8896473775 |
|
511 user: test |
|
512 date: Thu Jan 01 00:00:00 1970 +0000 |
|
513 summary: edit files |
|
514 |
|
515 changeset: 0:30d30fe6a5be |
|
516 user: test |
|
517 date: Thu Jan 01 00:00:00 1970 +0000 |
|
518 summary: add files |
|
519 |
|
520 $ cat sub/large4 |
438 $ cat sub/large4 |
521 large4-modified-again |
439 large4-modified-again |
522 |
440 |
523 "update --check" refuses to update with uncommitted changes. |
441 "update --check" refuses to update with uncommitted changes. |
524 $ hg update --check 8 |
442 $ hg update --check 8 |