Mercurial > evolve
comparison tests/test-topic-stack.t @ 3228:8cc8fb94cc00 stable
typos: fix typos in several locations
A user at Google attempted to fix our local copy because they had noticed a
typo (accross instead of across), but this will just get overwritten on our
next import. This commit fixes that case and a few others that my editor found.
Most of the typos were in comments, but user-visible output is changed in a few
cases:
- accross -> across
- splitted -> split
- ambigious -> ambiguous
- evolvestte -> evolvestate (this is in a ui.debug, so not often seen)
There is another typo that I wanted to fix, but didn't: 'supercede' is spelled
'superseed' in a few locations. I believe this is only internal to the
extension, instead of being user-visible, so while it could probably be fixed
easily, I wasn't 100% sure it didn't end up in a file on disk or something and
might cause problems, so I left it alone.
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Mon, 04 Dec 2017 14:27:27 -0800 |
parents | 3eca2cbdc498 |
children | c1d20598bc2b c0ee9ddfd5ff |
comparison
equal
deleted
inserted
replaced
3227:873d2f1949e1 | 3228:8cc8fb94cc00 |
---|---|
551 t1: c_D | 551 t1: c_D |
552 t0^ c_c (base) | 552 t0^ c_c (base) |
553 | 553 |
554 $ hg stack foo | 554 $ hg stack foo |
555 ### topic: foo | 555 ### topic: foo |
556 ### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads | 556 ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads |
557 t4: c_f | 557 t4: c_f |
558 ^ c_e | 558 ^ c_e |
559 t3: c_h | 559 t3: c_h |
560 t2: c_g | 560 t2: c_g |
561 ^ c_D | 561 ^ c_D |
643 t2: c_E | 643 t2: c_E |
644 t1: c_B | 644 t1: c_B |
645 t0^ c_A (base) | 645 t0^ c_A (base) |
646 $ hg stack blue | 646 $ hg stack blue |
647 ### topic: blue | 647 ### topic: blue |
648 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads | 648 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
649 t3@ c_I (current) | 649 t3@ c_I (current) |
650 ^ c_H | 650 ^ c_H |
651 t2: c_D | 651 t2: c_D |
652 ^ c_C | 652 ^ c_C |
653 t1: c_G | 653 t1: c_G |
696 o 0 default {} draft c_A | 696 o 0 default {} draft c_A |
697 | 697 |
698 | 698 |
699 $ hg stack red | 699 $ hg stack red |
700 ### topic: red | 700 ### topic: red |
701 ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads | 701 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
702 t5$ c_H (unstable) | 702 t5$ c_H (unstable) |
703 ^ c_G | 703 ^ c_G |
704 ^ c_D | 704 ^ c_D |
705 t4$ c_C (unstable) | 705 t4$ c_C (unstable) |
706 t1^ c_B (base) | 706 t1^ c_B (base) |
708 t2$ c_E (unstable) | 708 t2$ c_E (unstable) |
709 t1: c_B | 709 t1: c_B |
710 t0^ c_A (base) | 710 t0^ c_A (base) |
711 $ hg stack blue | 711 $ hg stack blue |
712 ### topic: blue | 712 ### topic: blue |
713 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads | 713 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
714 t3$ c_I (unstable) | 714 t3$ c_I (unstable) |
715 ^ c_H | 715 ^ c_H |
716 t2$ c_G (unstable) | 716 t2$ c_G (unstable) |
717 ^ c_F | 717 ^ c_F |
718 t1$ c_D (current unstable) | 718 t1$ c_D (current unstable) |
770 o 0 default {} draft c_A | 770 o 0 default {} draft c_A |
771 | 771 |
772 | 772 |
773 $ hg stack red | 773 $ hg stack red |
774 ### topic: red | 774 ### topic: red |
775 ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads | 775 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
776 t5$ c_H (unstable) | 776 t5$ c_H (unstable) |
777 ^ c_G | 777 ^ c_G |
778 ^ c_D | 778 ^ c_D |
779 t4$ c_F (unstable) | 779 t4$ c_F (unstable) |
780 t3$ c_E (unstable) | 780 t3$ c_E (unstable) |
782 t2$ c_C (unstable) | 782 t2$ c_C (unstable) |
783 t1: c_B | 783 t1: c_B |
784 t0^ c_A (base) | 784 t0^ c_A (base) |
785 $ hg stack blue | 785 $ hg stack blue |
786 ### topic: blue | 786 ### topic: blue |
787 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads | 787 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
788 t3$ c_I (unstable) | 788 t3$ c_I (unstable) |
789 ^ c_H | 789 ^ c_H |
790 t2$ c_G (unstable) | 790 t2$ c_G (unstable) |
791 ^ c_F | 791 ^ c_F |
792 t1$ c_D (current unstable) | 792 t1$ c_D (current unstable) |