Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
authorMatt Mackall <mpm@selenic.com>
Tue, 09 Oct 2007 17:44:44 -0500
changeset 5442 be015f9b7405
parent 5441 f9c2917a9f7a (diff)
parent 5432 0d154bce2341 (current diff)
child 5443 58496354773f
Merge with crew
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -587,7 +587,7 @@ class queue:
             top = revlog.bin(self.applied[-1].rev)
             pp = repo.dirstate.parents()
             if top not in pp:
-                raise util.Abort(_("queue top not at same revision as working directory"))
+                raise util.Abort(_("working directory revision is not qtip"))
             return top
         return None
     def check_localchanges(self, repo, force=False, refresh=True):
mercurial-crew-with-dirclash