equal
deleted
inserted
replaced
232 othervisit = basesvisit |
232 othervisit = basesvisit |
233 elif curr in basesvisit: |
233 elif curr in basesvisit: |
234 thisvisit = basesvisit |
234 thisvisit = basesvisit |
235 othervisit = revsvisit |
235 othervisit = revsvisit |
236 else: |
236 else: |
237 # not an ancestor of a or b: ignore |
237 # not an ancestor of revs or bases: ignore |
238 continue |
238 continue |
239 |
239 |
240 thisvisit.remove(curr) |
240 thisvisit.remove(curr) |
241 for p in pfunc(curr): |
241 for p in pfunc(curr): |
242 if p == nullrev: |
242 if p == nullrev: |