Show More
@@ -342,6 +342,9 b' def _includeunknownfiles(repo, pats, opt' | |||
|
342 | 342 | extra['shelve_unknown'] = '\0'.join(s.unknown) |
|
343 | 343 | repo[None].add(s.unknown) |
|
344 | 344 | |
|
345 | def _finishshelve(repo): | |
|
346 | _aborttransaction(repo) | |
|
347 | ||
|
345 | 348 | def _docreatecmd(ui, repo, pats, opts): |
|
346 | 349 | wctx = repo[None] |
|
347 | 350 | parents = wctx.parents() |
@@ -399,7 +402,7 b' def _docreatecmd(ui, repo, pats, opts):' | |||
|
399 | 402 | if origbranch != repo['.'].branch() and not _isbareshelve(pats, opts): |
|
400 | 403 | repo.dirstate.setbranch(origbranch) |
|
401 | 404 | |
|
402 | _aborttransaction(repo) | |
|
405 | _finishshelve(repo) | |
|
403 | 406 | finally: |
|
404 | 407 | lockmod.release(tr, lock) |
|
405 | 408 |
General Comments 0
You need to be logged in to leave comments.
Login now