Mercurial > public > mercurial-scm > hg

diff hgext/mq.py @ 10114:3e7663b2f3fc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: qnew -f should reject merge working directories
author timeless <timeless@mozdev.org>
date Wed, 23 Dec 2009 13:09:11 +0100
parents 46de82e50790
children 926c436964b4 8a47347d298b
line wrap: on
line diff
--- a/hgext/mq.py	Tue Dec 22 00:50:03 2009 +0100
+++ b/hgext/mq.py	Wed Dec 23 13:09:11 2009 +0100
@@ -770,6 +770,10 @@
         else:
             m, a, r, d = self.check_localchanges(repo, force)
             match = cmdutil.matchfiles(repo, m + a + r)
+        if force:
+            p = repo[None].parents()
+            if len(p) > 1:
+                raise util.Abort(_('cannot manage merge changesets'))
         commitfiles = m + a + r
         self.check_toppatch(repo)
         insert = self.full_series_end()