##// END OF EJS Templates
shelve: restore shelved dirstate explicitly after aborting transaction...
FUJIWARA Katsunori -
r26523:1d23bf6c default
parent child Browse files
Show More
@@ -340,10 +340,10 b' def createcmd(ui, repo, pats, opts):'
340 desc = util.ellipsis(desc, ui.termwidth())
340 desc = util.ellipsis(desc, ui.termwidth())
341 ui.status(_('shelved as %s\n') % name)
341 ui.status(_('shelved as %s\n') % name)
342 hg.update(repo, parent.node())
342 hg.update(repo, parent.node())
343
344 _aborttransaction(repo)
343 finally:
345 finally:
344 if tr:
346 lockmod.release(tr, lock, wlock)
345 tr.abort()
346 lockmod.release(lock, wlock)
347
347
348 def cleanupcmd(ui, repo):
348 def cleanupcmd(ui, repo):
349 """subcommand that deletes all shelves"""
349 """subcommand that deletes all shelves"""
General Comments 0
You need to be logged in to leave comments. Login now