Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/mq.py @ 3084:fd1479e30aaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: do not update an empty working directory after strip. Closes #296.
author Brendan Cully <brendan@kublai.com>
date Wed, 13 Sep 2006 16:41:03 -0700
parents 17747e80ea6c
children dc784839516d
line wrap: on
line diff
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1740,7 +1740,8 @@ def strip(ui, repo, rev, **opts):
         backup = 'strip'
     elif opts['nobackup']:
         backup = 'none'
-    repo.mq.strip(repo, rev, backup=backup)
+    update = repo.dirstate.parents()[0] != revlog.nullid
+    repo.mq.strip(repo, rev, backup=backup, update=update)
     return 0
 
 def select(ui, repo, *args, **opts):