[PATCH] Prevent qfold from automatically refreshing into the current patch prior to folding. (issue1662)

David Frey dpfrey at shaw.ca
Sat May 16 18:49:22 CDT 2009


# HG changeset patch
# User David Frey <dpfrey at shaw.ca>
# Date 1242516037 25200
# Node ID b55828069981e3db9e2259576f17e2888b85cb9c
# Parent  057e96fe29558cc84f3a50d38015a7360cf3df70
Prevent qfold from automatically refreshing into the current patch prior to folding. (issue1662)

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1943,6 +1943,7 @@
         raise util.Abort(_('qfold requires at least one patch name'))
     if not q.check_toppatch(repo):
         raise util.Abort(_('No patches applied'))
+    q.check_localchanges(repo)
 
     message = cmdutil.logmessage(opts)
     if opts['edit']:


More information about the Mercurial-devel mailing list