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