Mercurial > hg > mercurial-crew-with-dirclash

changeset 5443:58496354773f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Oct 2007 00:46:40 -0500
parents be015f9b7405 (diff) a19167001251 (current diff)
children a0952e4e52eb
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):