Show More
@@ -94,7 +94,8 class transplanter(object): | |||
|
94 | 94 | parentrev = repo.changelog.rev(parent) |
|
95 | 95 | if hasnode(repo, node): |
|
96 | 96 | rev = repo.changelog.rev(node) |
|
97 |
reachable = repo.changelog. |
|
|
97 | reachable = repo.changelog.ancestors([parentrev], rev, | |
|
98 | inclusive=True) | |
|
98 | 99 | if rev in reachable: |
|
99 | 100 | return True |
|
100 | 101 | for t in self.transplants.get(node): |
@@ -103,7 +104,8 class transplanter(object): | |||
|
103 | 104 | self.transplants.remove(t) |
|
104 | 105 | return False |
|
105 | 106 | lnoderev = repo.changelog.rev(t.lnode) |
|
106 |
if lnoderev in repo.changelog. |
|
|
107 | if lnoderev in repo.changelog.ancestors([parentrev], lnoderev, | |
|
108 | inclusive=True): | |
|
107 | 109 | return True |
|
108 | 110 | return False |
|
109 | 111 |
General Comments 0
You need to be logged in to leave comments.
Login now