Mercurial > evolve
comparison tests/test-topic.t @ 3225:28fb347a5bf8
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 | c0ee9ddfd5ff f7129e3d5a38 |
comparison
equal
deleted
inserted
replaced
| 3224:bac69ab0782c | 3225:28fb347a5bf8 |
|---|---|
| 636 $ hg up fran | 636 $ hg up fran |
| 637 switching to topic fran | 637 switching to topic fran |
| 638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 639 $ hg stack | 639 $ hg stack |
| 640 ### topic: fran | 640 ### topic: fran |
| 641 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads | 641 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
| 642 t1@ start on fran (current) | 642 t1@ start on fran (current) |
| 643 t0^ Add file delta (base) | 643 t0^ Add file delta (base) |
| 644 | 644 |
| 645 $ hg up t0 | 645 $ hg up t0 |
| 646 preserving the current topic 'fran' | 646 preserving the current topic 'fran' |
| 648 | 648 |
| 649 $ hg topic | 649 $ hg topic |
| 650 * fran (1 changesets) | 650 * fran (1 changesets) |
| 651 $ hg stack | 651 $ hg stack |
| 652 ### topic: fran | 652 ### topic: fran |
| 653 ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads | 653 ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads |
| 654 t1: start on fran | 654 t1: start on fran |
| 655 t0^ Add file delta (base current) | 655 t0^ Add file delta (base current) |
| 656 | 656 |
| 657 $ hg topics --age | 657 $ hg topics --age |
| 658 * fran (1970-01-01 by test) | 658 * fran (1970-01-01 by test) |