Show More
@@ -1172,9 +1172,9 b' class localrepository(object):' | |||||
1172 | vfsmap = {'plain': self.vfs, '': self.svfs} |
|
1172 | vfsmap = {'plain': self.vfs, '': self.svfs} | |
1173 | transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) |
|
1173 | transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn) | |
1174 | if self.vfs.exists('undo.bookmarks'): |
|
1174 | if self.vfs.exists('undo.bookmarks'): | |
1175 | self.vfs.rename('undo.bookmarks', 'bookmarks') |
|
1175 | self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True) | |
1176 | if self.svfs.exists('undo.phaseroots'): |
|
1176 | if self.svfs.exists('undo.phaseroots'): | |
1177 | self.svfs.rename('undo.phaseroots', 'phaseroots') |
|
1177 | self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) | |
1178 | self.invalidate() |
|
1178 | self.invalidate() | |
1179 |
|
1179 | |||
1180 | parentgone = (parents[0] not in self.changelog.nodemap or |
|
1180 | parentgone = (parents[0] not in self.changelog.nodemap or |
General Comments 0
You need to be logged in to leave comments.
Login now