[PATCH 2 of 4] mq: do not update an empty working directory after
strip
Brendan Cully
brendan at kublai.com
Wed Sep 13 18:43:55 CDT 2006
# HG changeset patch
# User Brendan Cully <brendan at kublai.com>
# Date 1158190863 25200
# Node ID fd1479e30aaf59c74358855894fabb3a8d9740d4
# Parent 17747e80ea6c4bf8ae5c7167c8f32c04cccae174
mq: do not update an empty working directory after strip.
Closes #296.
diff -r 17747e80ea6c -r fd1479e30aaf hgext/mq.py
--- a/hgext/mq.py Tue Sep 12 11:11:19 2006 -0700
+++ b/hgext/mq.py Wed Sep 13 16:41:03 2006 -0700
@@ -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):
More information about the Mercurial
mailing list