Show More
@@ -2011,8 +2011,7 b' class localrepository(object):' | |||||
2011 | self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) |
|
2011 | self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True) | |
2012 | self.invalidate() |
|
2012 | self.invalidate() | |
2013 |
|
2013 | |||
2014 |
parentgone = (p |
|
2014 | parentgone = any(p not in self.changelog.nodemap for p in parents) | |
2015 | parents[1] not in self.changelog.nodemap) |
|
|||
2016 | if parentgone: |
|
2015 | if parentgone: | |
2017 | # prevent dirstateguard from overwriting already restored one |
|
2016 | # prevent dirstateguard from overwriting already restored one | |
2018 | dsguard.close() |
|
2017 | dsguard.close() |
General Comments 0
You need to be logged in to leave comments.
Login now