Show More
@@ -446,11 +446,8 b' def _includeunknownfiles(repo, pats, opt' | |||||
446 |
|
446 | |||
447 | def _finishshelve(repo): |
|
447 | def _finishshelve(repo): | |
448 | if phases.supportinternal(repo): |
|
448 | if phases.supportinternal(repo): | |
449 | backupname = 'dirstate.shelve' |
|
|||
450 | tr = repo.currenttransaction() |
|
449 | tr = repo.currenttransaction() | |
451 | repo.dirstate.savebackup(tr, backupname) |
|
|||
452 | tr.close() |
|
450 | tr.close() | |
453 | repo.dirstate.restorebackup(None, backupname) |
|
|||
454 | else: |
|
451 | else: | |
455 | _aborttransaction(repo) |
|
452 | _aborttransaction(repo) | |
456 |
|
453 |
General Comments 0
You need to be logged in to leave comments.
Login now