equal
deleted
inserted
replaced
308 p != nullid]) |
308 p != nullid]) |
309 elif n in heads: # We've seen it before, is it a fake head? |
309 elif n in heads: # We've seen it before, is it a fake head? |
310 # So it is, real heads should not be the ancestors of |
310 # So it is, real heads should not be the ancestors of |
311 # any other heads. |
311 # any other heads. |
312 heads.pop(n) |
312 heads.pop(n) |
|
313 if not ancestors: |
|
314 return ([], [], []) |
313 # Now that we have our set of ancestors, we want to remove any |
315 # Now that we have our set of ancestors, we want to remove any |
314 # roots that are not ancestors. |
316 # roots that are not ancestors. |
315 |
317 |
316 # If one of the roots was nullid, everything is included anyway. |
318 # If one of the roots was nullid, everything is included anyway. |
317 if lowestrev > -1: |
319 if lowestrev > -1: |