equal
deleted
inserted
replaced
519 abort: failed to downgrade share, got error: Lock held |
519 abort: failed to downgrade share, got error: Lock held |
520 (see `hg help config.format.use-share-safe` for more information) |
520 (see `hg help config.format.use-share-safe` for more information) |
521 [255] |
521 [255] |
522 $ rm ../ss-share/.hg/wlock |
522 $ rm ../ss-share/.hg/wlock |
523 |
523 |
|
524 $ cp -R ../ss-share ../ss-share-bck |
524 $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort |
525 $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort |
525 repository downgraded to not use share-safe mode |
526 repository downgraded to not use share-safe mode |
|
527 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
|
528 | |
|
529 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
|
530 |
|
531 $ rm -rf ../ss-share |
|
532 $ mv ../ss-share-bck ../ss-share |
|
533 |
|
534 $ hg log -GT "{node}: {desc}\n" -R ../ss-share --config share.safe-mismatch.source-not-safe=downgrade-abort --config share.safe-mismatch.source-not-safe:verbose-upgrade=no |
526 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
535 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
527 | |
536 | |
528 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
537 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
529 |
538 |
530 |
539 |
586 abort: failed to upgrade share, got error: Lock held |
595 abort: failed to upgrade share, got error: Lock held |
587 (see `hg help config.format.use-share-safe` for more information) |
596 (see `hg help config.format.use-share-safe` for more information) |
588 [255] |
597 [255] |
589 |
598 |
590 $ rm ../nss-share/.hg/wlock |
599 $ rm ../nss-share/.hg/wlock |
|
600 $ cp -R ../nss-share ../nss-share-bck |
591 $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-abort |
601 $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-abort |
592 repository upgraded to use share-safe mode |
602 repository upgraded to use share-safe mode |
|
603 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
|
604 | |
|
605 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
|
606 |
|
607 $ rm -rf ../nss-share |
|
608 $ mv ../nss-share-bck ../nss-share |
|
609 $ hg log -GT "{node}: {desc}\n" -R ../nss-share --config share.safe-mismatch.source-safe=upgrade-abort --config share.safe-mismatch.source-safe:verbose-upgrade=no |
593 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
610 @ f63db81e6dde1d9c78814167f77fb1fb49283f4f: added bar |
594 | |
611 | |
595 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
612 o f3ba8b99bb6f897c87bbc1c07b75c6ddf43a4f77: added foo |
596 |
613 |
597 |
614 |