diff hgext/mq.py @ 6558:550c53d66949

merge from crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 16 Apr 2008 16:07:15 +0200
parents f2bd49752f0d 3182602fa1fb
children 090f2145df7d
line wrap: on
line diff
--- a/hgext/mq.py	Wed Apr 16 12:15:43 2008 +0200
+++ b/hgext/mq.py	Wed Apr 16 16:07:15 2008 +0200
@@ -509,7 +509,8 @@
                 p1, p2 = repo.dirstate.parents()
                 repo.dirstate.setparents(p1, merge)
             files = patch.updatedir(self.ui, repo, files)
-            n = repo.commit(files, message, user, date, force=1)
+            n = repo.commit(files, message, user, date, match=util.never,
+                            force=True)
 
             if n == None:
                 raise util.Abort(_("repo commit failed"))