Mercurial > hg
changeset 17855:526081552f3d stable
localrepo: translate "push includes X changeset" only once
This was introduced in 12fdaa30063a
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 23 Oct 2012 09:22:46 +0200 |
| parents | afbc7714c323 |
| children | 917a37b76845 8ef4b022d562 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Oct 23 09:27:48 2012 +0200 +++ b/mercurial/localrepo.py Tue Oct 23 09:22:46 2012 +0200 @@ -1880,11 +1880,11 @@ for node in outgoing.missingheads: ctx = self[node] if ctx.obsolete(): - raise util.Abort(_(mso) % ctx) + raise util.Abort(mso % ctx) elif ctx.unstable(): - raise util.Abort(_(msu) % ctx) + raise util.Abort(msu % ctx) elif ctx.bumped(): - raise util.Abort(_(msb) % ctx) + raise util.Abort(msb % ctx) discovery.checkheads(self, remote, outgoing, remoteheads, newbranch, bool(inc))