--- a/hgext/mq.py Fri Jun 01 15:14:29 2012 -0500
+++ b/hgext/mq.py Fri Jun 01 23:42:27 2012 -0500
@@ -3005,14 +3005,14 @@
finally:
wlock.release()
- repo.mq.strip(repo, revs, backup=backup, update=update,
- force=opts.get('force'))
-
if opts.get('bookmark'):
del marks[mark]
repo._writebookmarks(marks)
ui.write(_("bookmark '%s' deleted\n") % mark)
+ repo.mq.strip(repo, revs, backup=backup, update=update,
+ force=opts.get('force'))
+
return 0
@command("qselect",
--- a/tests/test-mq-strip.t Fri Jun 01 15:14:29 2012 -0500
+++ b/tests/test-mq-strip.t Fri Jun 01 23:42:27 2012 -0500
@@ -447,9 +447,9 @@
abort: empty revision set
[255]
$ hg strip -B todelete
+ bookmark 'todelete' deleted
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
- bookmark 'todelete' deleted
$ hg id -ir dcbb326fdec2
abort: unknown revision 'dcbb326fdec2'!
[255]
@@ -459,8 +459,8 @@
B 9:ff43616e5d0f
delete 6:2702dd0c91e7
$ hg strip -B delete
+ bookmark 'delete' deleted
saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
- bookmark 'delete' deleted
$ hg id -ir 6:2702dd0c91e7
abort: unknown revision '2702dd0c91e7'!
[255]