Show More
@@ -552,11 +552,7 b' class queue(object):' | |||||
552 | return None |
|
552 | return None | |
553 | return self.applied[-1].node |
|
553 | return self.applied[-1].node | |
554 | p1, p2 = repo.changelog.parents(rev) |
|
554 | p1, p2 = repo.changelog.parents(rev) | |
555 | if p2 != nullid: |
|
555 | if p2 != nullid and p2 in [x.node for x in self.applied]: | |
556 | arevs = [x.node for x in self.applied] |
|
|||
557 | if p1 in arevs: |
|
|||
558 | return p1 |
|
|||
559 | if p2 in arevs: |
|
|||
560 |
|
|
556 | return p2 | |
561 | return p1 |
|
557 | return p1 | |
562 |
|
558 |
General Comments 0
You need to be logged in to leave comments.
Login now