Show More
@@ -601,10 +601,10 b' class phasecache(object):' | |||||
601 | # retracted. |
|
601 | # retracted. | |
602 | minnewroot = min(newroots) |
|
602 | minnewroot = min(newroots) | |
603 | aboveroots = [rev for rev in currentroots if rev >= minnewroot] |
|
603 | aboveroots = [rev for rev in currentroots if rev >= minnewroot] | |
604 |
updatedroots = repo.s |
|
604 | updatedroots = repo.revs(b'roots(%ld::)', aboveroots) | |
605 |
|
605 | |||
606 | finalroots = {rev for rev in currentroots if rev < minnewroot} |
|
606 | finalroots = {rev for rev in currentroots if rev < minnewroot} | |
607 |
finalroots.update( |
|
607 | finalroots.update(updatedroots) | |
608 | if finalroots != oldroots: |
|
608 | if finalroots != oldroots: | |
609 | self._updateroots( |
|
609 | self._updateroots( | |
610 | targetphase, {tonode(rev) for rev in finalroots}, tr |
|
610 | targetphase, {tonode(rev) for rev in finalroots}, tr |
General Comments 0
You need to be logged in to leave comments.
Login now