diff -r dd51abf0aa17 -r 3480c07fc934 hgext/rebase.py --- a/hgext/rebase.py Mon Nov 10 13:20:56 2014 -0500 +++ b/hgext/rebase.py Tue Nov 11 18:43:19 2014 -0600 @@ -274,8 +274,12 @@ "can't compute rebase set\n")) return 1 commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first() - rebaseset = repo.revs('(%d::(%ld) - %d)::', - commonanc, base, commonanc) + if commonanc is not None: + rebaseset = repo.revs('(%d::(%ld) - %d)::', + commonanc, base, commonanc) + else: + rebaseset = [] + if not rebaseset: # transform to list because smartsets are not comparable to # lists. This should be improved to honor laziness of