Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: translate "push includes X changeset" only once stable
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 23 Oct 2012 09:22:46 +0200
branchstable
changeset 17855 526081552f3d
parent 17854 afbc7714c323
child 17856 917a37b76845
child 17857 8ef4b022d562
localrepo: translate "push includes X changeset" only once This was introduced in 12fdaa30063a
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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))
hg-stable