equal
deleted
inserted
replaced
507 $ cat .hglf/large1 |
507 $ cat .hglf/large1 |
508 58e24f733a964da346e2407a2bee99d9001184f5 |
508 58e24f733a964da346e2407a2bee99d9001184f5 |
509 $ cat large1 |
509 $ cat large1 |
510 large1 in #1 |
510 large1 in #1 |
511 |
511 |
512 $ hg rebase -q --abort |
512 Test that rebase updates standins for manually modified largefiles at |
513 rebase aborted |
513 the 1st commit of resuming. |
|
514 |
|
515 $ echo "manually modified before 'hg rebase --continue'" > large1 |
|
516 $ hg resolve -m normal1 |
|
517 (no more unresolved files) |
|
518 $ hg rebase --continue --config ui.interactive=True <<EOF |
|
519 > c |
|
520 > EOF |
|
521 local changed .hglf/large1 which remote deleted |
|
522 use (c)hanged version or (d)elete? c |
|
523 |
|
524 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
|
525 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
|
526 +8a4f783556e7dea21139ca0466eafce954c75c13 |
|
527 $ rm -f large1 |
|
528 $ hg update -q -C tip |
|
529 $ cat large1 |
|
530 manually modified before 'hg rebase --continue' |
514 |
531 |
515 Test that transplant updates largefiles, of which standins are safely |
532 Test that transplant updates largefiles, of which standins are safely |
516 changed, even if it is aborted by conflict of other. |
533 changed, even if it is aborted by conflict of other. |
517 |
534 |
518 $ hg update -q -C 5 |
535 $ hg update -q -C 5 |