Mercurial > evolve
comparison tests/test-prev-next.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 | 945a0989e41b |
children | c1d20598bc2b c0ee9ddfd5ff |
comparison
equal
deleted
inserted
replaced
3227:873d2f1949e1 | 3228:8cc8fb94cc00 |
---|---|
198 created new head | 198 created new head |
199 $ hg prev | 199 $ hg prev |
200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
201 [3] added b (2) | 201 [3] added b (2) |
202 $ hg next | 202 $ hg next |
203 ambigious next changeset: | 203 ambiguous next changeset: |
204 [4] added c | 204 [4] added c |
205 [5] added d | 205 [5] added d |
206 explicitly update to one of them | 206 explicitly update to one of them |
207 [1] | 207 [1] |
208 | 208 |
213 $ hg next | 213 $ hg next |
214 no children | 214 no children |
215 (2 unstable changesets to be evolved here, do you want --evolve?) | 215 (2 unstable changesets to be evolved here, do you want --evolve?) |
216 [1] | 216 [1] |
217 $ hg next --evolve | 217 $ hg next --evolve |
218 ambigious next (unstable) changeset: | 218 ambiguous next (unstable) changeset: |
219 [4] added c | 219 [4] added c |
220 [5] added d | 220 [5] added d |
221 (run 'hg evolve --rev REV' on one of them) | 221 (run 'hg evolve --rev REV' on one of them) |
222 [1] | 222 [1] |
223 $ hg evolve -r 5 | 223 $ hg evolve -r 5 |