equal
deleted
inserted
replaced
399 if cwd in targetancestors: |
399 if cwd in targetancestors: |
400 repo.ui.debug('source is ancestor of destination\n') |
400 repo.ui.debug('source is ancestor of destination\n') |
401 return None |
401 return None |
402 |
402 |
403 cwdancestors = set(repo.changelog.ancestors(cwd)) |
403 cwdancestors = set(repo.changelog.ancestors(cwd)) |
|
404 if dest in cwdancestors: |
|
405 repo.ui.debug('source is descendant of destination\n') |
|
406 return None |
|
407 |
404 cwdancestors.add(cwd) |
408 cwdancestors.add(cwd) |
405 rebasingbranch = cwdancestors - targetancestors |
409 rebasingbranch = cwdancestors - targetancestors |
406 source = min(rebasingbranch) |
410 source = min(rebasingbranch) |
407 |
411 |
408 repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source)) |
412 repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source)) |