equal
deleted
inserted
replaced
1005 if dryrun: |
1005 if dryrun: |
1006 return 0 |
1006 return 0 |
1007 |
1007 |
1008 parents = self.dirstate.parents() |
1008 parents = self.dirstate.parents() |
1009 self.destroying() |
1009 self.destroying() |
1010 vfsmap = {'plain': self.vfs} |
1010 vfsmap = {'plain': self.vfs, '': self.svfs} |
1011 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) |
1011 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) |
1012 if self.vfs.exists('undo.bookmarks'): |
1012 if self.vfs.exists('undo.bookmarks'): |
1013 self.vfs.rename('undo.bookmarks', 'bookmarks') |
1013 self.vfs.rename('undo.bookmarks', 'bookmarks') |
1014 if self.svfs.exists('undo.phaseroots'): |
1014 if self.svfs.exists('undo.phaseroots'): |
1015 self.svfs.rename('undo.phaseroots', 'phaseroots') |
1015 self.svfs.rename('undo.phaseroots', 'phaseroots') |