Mercurial > hg
comparison tests/test-commit-amend.t @ 47019:c4dbbaecaad3
rewriteutil: adapt "cannot %s while merging" to work with "change branch of"
`rewriteutil.precheck()` creates error messages by inserting a given
verb into a sentence. The `hg branch -r` command passes in "change
branch of" as the verb. That doesn't work well with "cannot %s while
merging" (making it "cannot change branch of while merging"). Let's
insert a "changeset" there to make it work better.
Building sentences like this seems obviously bad for i18n, but fixing
that is out of scope for this series, IMO.
Differential Revision: https://phab.mercurial-scm.org/D10530
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 28 Apr 2021 08:48:10 -0700 |
| parents | 768056549737 |
| children | 5b6dd0d9171b |
comparison
equal
deleted
inserted
replaced
| 47018:7a90fddb13b0 | 47019:c4dbbaecaad3 |
|---|---|
| 404 $ hg up -q default | 404 $ hg up -q default |
| 405 $ hg merge foo | 405 $ hg merge foo |
| 406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 407 (branch merge, don't forget to commit) | 407 (branch merge, don't forget to commit) |
| 408 $ hg ci --amend | 408 $ hg ci --amend |
| 409 abort: cannot amend while merging | 409 abort: cannot amend changesets while merging |
| 410 [20] | 410 [20] |
| 411 $ hg ci -m 'merge' | 411 $ hg ci -m 'merge' |
| 412 | 412 |
| 413 Refuse to amend if there is a merge conflict (issue5805): | 413 Refuse to amend if there is a merge conflict (issue5805): |
| 414 | 414 |