Mercurial > hg
comparison hgext/uncommit.py @ 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 | d55b71393907 |
children | 54849b65dc5f |
comparison
equal
deleted
inserted
replaced
47018:7a90fddb13b0 | 47019:c4dbbaecaad3 |
---|