Show More
@@ -41,7 +41,6 b' from mercurial import (' | |||||
41 | lock as lockmod, |
|
41 | lock as lockmod, | |
42 | mdiff, |
|
42 | mdiff, | |
43 | merge, |
|
43 | merge, | |
44 | narrowspec, |
|
|||
45 | node as nodemod, |
|
44 | node as nodemod, | |
46 | patch, |
|
45 | patch, | |
47 | phases, |
|
46 | phases, | |
@@ -327,11 +326,8 b' def _aborttransaction(repo, tr):' | |||||
327 | '''Abort current transaction for shelve/unshelve, but keep dirstate |
|
326 | '''Abort current transaction for shelve/unshelve, but keep dirstate | |
328 | ''' |
|
327 | ''' | |
329 | dirstatebackupname = 'dirstate.shelve' |
|
328 | dirstatebackupname = 'dirstate.shelve' | |
330 | narrowspecbackupname = 'narrowspec.shelve' |
|
|||
331 | repo.dirstate.savebackup(tr, dirstatebackupname) |
|
329 | repo.dirstate.savebackup(tr, dirstatebackupname) | |
332 | narrowspec.savebackup(repo, narrowspecbackupname) |
|
|||
333 | tr.abort() |
|
330 | tr.abort() | |
334 | narrowspec.restorebackup(repo, narrowspecbackupname) |
|
|||
335 | repo.dirstate.restorebackup(None, dirstatebackupname) |
|
331 | repo.dirstate.restorebackup(None, dirstatebackupname) | |
336 |
|
332 | |||
337 | def getshelvename(repo, parent, opts): |
|
333 | def getshelvename(repo, parent, opts): |
General Comments 0
You need to be logged in to leave comments.
Login now