hgext/mq.py
changeset 16291 9952ac7e0968
parent 16279 531e69ff348f
parent 16290 9518cb55c822
child 16318 73f4e05287b4
--- a/hgext/mq.py	Mon Mar 26 16:42:53 2012 -0500
+++ b/hgext/mq.py	Tue Mar 27 14:37:17 2012 -0500
@@ -844,8 +844,9 @@
         if qfinished and repo.ui.configbool('mq', 'secret', False):
             # only use this logic when the secret option is added
             oldqbase = repo[qfinished[0]]
-            if oldqbase.p1().phase() < phases.secret:
-                phases.advanceboundary(repo, phases.draft, qfinished)
+            tphase = repo.ui.config('phases', 'new-commit', phases.draft)
+            if oldqbase.phase() > tphase and oldqbase.p1().phase() <= tphase:
+                phases.advanceboundary(repo, tphase, qfinished)
 
     def delete(self, repo, patches, opts):
         if not patches and not opts.get('rev'):